new commit
Merge branch 'master' of https://github.com/bacontree/cust-provision-02

Conflicts:
	app/controllers/Application.scala
	app/models/Cast.scala