US536 - fix broken tests
Merge branch 'release-work' into release

Conflicts:
	c3/test/controllers/LanguageIntegrationSpec.scala
Merge branch 'release' into development