Merge remote-tracking branch 'origin/robert'

Conflicts:
	app/models/Cassandra.scala
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/semitom/WCC
improved actor to add data to database