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