Add gogrid cloud page
Merge pull request #24 from rajthilakmca/master

Add gogrid cloud page
Merge pull request #25 from indykish/master

DR changes, and market place changes
changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile.lock
Merge pull request #26 from indykish/master

UI tweaks to close the DR UI.
changes
Merge remote-tracking branch 'origin/master'
Fix marketplace plan type and version
Merge pull request #27 from rajthilakmca/master

Add version based download
Openqrm setup init
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/thomasalrin/nilavu

Conflicts:
	app/views/marketplaces/show.html.erb
Minor tweak to the marketplaces userinterface