Merge branch 'master' of https://github.com/tpalanga/akka-chat into 11_fix_integration_test

Conflicts:
	app/assets/javascripts/index.coffee