edit
Merge branch 'master' of https://github.com/dan91/PlayStartApp

Conflicts:
	app/views/experimenter/edit.scala.html
edit
Merge branch 'master' of https://github.com/dan91/PlayStartApp