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
Fix to include AssemblySpec (get)
Merge remote-tracking branch 'origin/0.5' into 0.5
Merge pull request #79 from indykish/0.5

0.5
Add marketplace items
Merge branch '0.5' of https://github.com/rajthilakmca/megam_play into rajthilakmca-0.5

Conflicts:
	test/AccountsSpec.scala
Merge branch 'rajthilakmca-0.5' into 0.5
Merge remote-tracking branch 'origin/0.5' into 0.5
change component keys
Merge pull request #81 from rajthilakmca/0.5

change component keys
removed cloud tool, and nuked cloudtool getting added to a new user.