Fix functional tests with Persona
Merge branch 'master' into persona-login-functional-tests

Conflicts:
	server/presence.js
Merge branch 'master' into persona-login-functional-tests

Conflicts:
	config/development.json
	config/production.json
	config/test.json
	server/presence.js
Fix jshint errors
Fix syntax error in the production configuration caused by #202. rs=bustage-fix
Move the persona.js mock to test/functional/
Worker: remove an obsolete test
Merge branch 'master' into persona-login-functional-tests

Conflicts:
	config/production.json
Merge pull request #203 from tOkeshu/persona-login-functional-tests

Persona login functional tests