front fix
Merge branch 'master' of github.com:pholda/discats

Conflicts:
	front/app/controllers/SimController.scala