tweaks and bug fixes
Merge branch 'master' of https://github.com/russellwstanley/snake

Conflicts:
	app/actors/Actors.scala
	app/controllers/Application.scala
tidy up