changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile.lock
changes
Merge remote-tracking branch 'origin/master'
Pie chart shows crowded data when %percentage is lower
Fix marketplace plan type and version
Merge pull request #27 from rajthilakmca/master

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

Conflicts:
	app/views/marketplaces/show.html.erb
change version order
Merge pull request #29 from rajthilakmca/master

change version order
Minor tweak to the marketplaces userinterface
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/marketplaces/show.html.erb
Cloud forms fix