Merge branch 'akka-actors' of https://github.com/mildlyskilled/actor-chat into akka-actors

Conflicts:
	src/main/resources/common.conf