cc
Merge remote-tracking branch 'origin/0.5' into 0.5
Merge remote-tracking branch 'origin/0.5' into 0.5
cc
Merge remote-tracking branch 'origin/0.5' into 0.5
Fix some errors
temp file gemfile.lock
Merge branch '0.5' of https://github.com/rajthilakmca/nilavu into rajthilakmca-0.5
Merge branch 'rajthilakmca-0.5' into 0.5
Merge remote-tracking branch 'origin/0.5' into 0.5

Conflicts:
	app/controllers/main_dashboards_controller.rb
	app/views/main_dashboards/index.html.erb