BugFix #151 hrefbug
service popups fixed
Addons bugfix
Merge branch '0.5' of https://github.com/morpheyesh/nilavu into morpheyesh-0.5

Conflicts:
	app/views/marketplaces/_category_view_form.html.erb
	config/routes.rb
Merge branch 'morpheyesh-0.5' into 0.5