Tests now work under phantomjs again
Add setting to enable/disable MUC
Don't use id for controlbox panes
Fix tests that were broken after vCard changes

Conflicts:
	tests_main.js
Merge branch '0.6.x'

Conflicts:
	converse.css
	converse.js
	index.html

Add allow_muc config option
Add config option ``allow_contact_requests`` to toggle user adding
Sort default values
Merge branch '0.6.x'

Conflicts:
	converse.js
	index.html

Add config option ``allow_contact_requests`` to toggle user adding
Add config option ``allow_contact_requests`` to toggle user adding
Merge branch '0.6.x'

Conflicts:
	converse.js
	index.html