LIVE
Init
Merge branch 'master' of ssh://github.com/headdetect/Web-Chatterbox

Conflicts:
	conf/application.conf
	conf/evolutions/default/1.sql
	project/Build.scala
	project/build.properties
	project/plugins.sbt