Updated for Play 2.3.0 and latest  Activiti
Merge remote-tracking branch 'origin/master'

Conflicts:
	build.sbt