Change Play.applicate.getFile to Play.resource
Merge branch 'develop'

Conflicts:
	app/controllers/Application.scala