take a tour changes
Merge branch '0.5' of https://github.com/thomasalrin/nilavu into 0.5

Conflicts:
	app/controllers/main_dashboards_controller.rb