Merge remote-tracking branch 'origin/master' into wip-issue-150-api

Conflicts:
	app/controllers/CompilerService.scala
	build.sbt