changes
Merge branch 'master' of https://github.com/kosakm/employee-tracker

Conflicts:
	app/actors/LocationReceiveActor.scala
cg