Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
angular js - 1.3 beta
Merge remote-tracking branch 'rt/master'

Conflicts:
	Gemfile.lock
oneapp panel button x dismisses now.
Merge remote-tracking branch 'rt/master'
lock file updated (rails 4.1.0rc2)
Merge remote-tracking branch 'rt/master'
fixes to make the menu names consistent
maintenance page
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile.lock
	app/views/apps/new.html.erb
	app/views/sessions/new.html.erb
Merge pull request #22 from rajthilakmca/master

Fix market_place page order
tmp file gemlock
drbd ui
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