add services
Merge remote-tracking branch 'origin/0.5' into 0.5
minor ui changes
Merge remote-tracking branch 'origin/0.5' into 0.5
dash and oneapp
Merge branch '0.5' of https://github.com/thomasalrin/nilavu into 0.5

Conflicts:
	app/views/sessions/new.html.erb
Merge remote-tracking branch 'origin/0.5' into 0.5

Conflicts:
	app/controllers/main_dashboards_controller.rb