cc
Merge remote-tracking branch 'origin/0.5' into 0.5

Conflicts:
	app/models/json/tosca/OrganizationsResultSerializations.scala
	test/AccountsSpec.scala
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
Merge pull request #78 from rajthilakmca/0.5

change dir in primed file