beautify changes
Merge branch 'master' into beautify

Conflicts:
	test/selenium/chat-area-test.js
	test/selenium/create-room-test.js
	test/selenium/embed-test.js
Merge pull request #392 from scrollback/beautify

beautify changes