Update names, add json dependency
Merge branch 'on_spray-can_1.1' of https://github.com/ladrl/spray-template into on_spray-can_1.1

Conflicts:
	src/main/scala/com/example/PokerPlayer.scala