Fix market_place page order
Merge pull request #22 from rajthilakmca/master

Fix market_place page order
tmp file gemlock
Add gogrid cloud page
changes
Merge branch 'master' of https://github.com/thomasalrin/nilavu

Conflicts:
	Gemfile.lock
Merge pull request #24 from rajthilakmca/master

Add gogrid cloud page
DR changes, and market place changes
Merge pull request #25 from indykish/master

DR changes, and market place changes
UI tweaks to close the DR UI.
Merge pull request #26 from indykish/master

UI tweaks to close the DR UI.
Openqrm setup init