Conflicts:
	app.js
	index.html
	libs/colibri/colibri.focus.js
	libs/modules/statistics.bundle.js
	moderator.js
	modules/UI/videolayout/VideoLayout.js
	muc.js

Makes "authentication required" dialog persistent. Joins the room if someone else authenticates first and creates the conference for us.

Converts 'constraints' to local variable in order to fix desktop sharing issues(audio constraints were retained in global var and get desktop stream failed).

Adds jicofo install instructions.

Prevent XSS injection using 'nick' tag on presence

Fixes chat messages

Adds 'jicofo' package to Deinstall section.