Merge pull request #4 from indykish/master

Marketplace enable postgres, riak, redis (disable attach app)
Add market place addons
Fix marketplace addons
Merge branch 'master' of https://github.com/rajthilakmca/megam_play

Conflicts:
	app/models/MarketPlaces.scala
Merge branch 'master' of https://github.com/megamsys/megam_play