Updating play to 2.1.5
Merge branch 'development' into postmvp

Conflicts:
	c3/project/plugins.sbt