cc
Merge remote-tracking branch 'origin/0.5' into 0.5
Issues are fixed
Merge pull request #148 from rajthilakmca/0.5

Issues are fixed
Fix some issues
Merge pull request #149 from rajthilakmca/0.5

Fix some issues
BugFix #151 hrefbug
service popups fixed
We now use a common spinner for angular logs and others. Please use spinlock
Addons bugfix
Some issues are fixed
Merge pull request #155 from rajthilakmca/0.5

Some issues are fixed
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
update megam_api gem version to 0.24