Adding mouse support
Merge remote-tracking branch 'origin/master' into wip-model-status-api

Conflicts:
	app/models/ModelSaver.scala
	build.sbt