change primed file creation and omit untested marketplace items
Merge remote-tracking branch 'master/0.5' into 0.5

Conflicts:
	app/Global.scala
	app/controllers/Constants.scala
	app/models/MarketPlaces.scala