fixed stage version
Merge branch 'dev'

Conflicts:
	app/views/index.scala.html
	conf/messages.de
Merge branch 'dev'
mixed message files
Merge branch 'master' into dev