Fix marketplace order and google delete
Merge branch 'master' of https://github.com/rajthilakmca/megam_play into rajthilakmca-master

Conflicts:
	app/models/MarketPlaces.scala
a typo, i missed during merge.
Marketplace enable postgres, riak, redis (disable attach app)
Merge pull request #4 from indykish/master

Marketplace enable postgres, riak, redis (disable attach app)
Add market place addons
Fix marketplace addons
version change to 0.3, scala 2.10.4
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
Add gogrid cloud tool
change addon request format
Merge pull request #6 from rajthilakmca/master

change addon queue format
Move sbt to 0.13.5 M2
support for 0.13.5 M2 incremental compile
Merge pull request #7 from indykish/master

Upgrade SBT to 0.13.5-M2
Add marketplace plans with error
Merge pull request #8 from rajthilakmca/master

Add marketplace plans with error
Marketplace addons per plan price type support added. Extend on raj's code.
Merge pull request #9 from indykish/master

Marketplace addons per plan price type support added. Extend on raj's co...