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
Merge pull request #130 from morpheyesh/0.5

0.5
dash and oneapp
Add docker and app boilers create page
password reset, user edit for org fix.
Merge pull request #133 from indykish/0.5

password reset, user edit for org fix.
Merge pull request #132 from rajthilakmca/0.5

Add docker and app boilers create page
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
Fix apps runnning counter
Merge pull request #134 from rajthilakmca/0.5

Fix apps runnning counter
take a tour changes
Fix error
Merge branch '0.5' of https://github.com/thomasalrin/nilavu into 0.5

Conflicts:
	app/controllers/main_dashboards_controller.rb
Merge pull request #136 from rajthilakmca/0.5

Fix error
fix to make the assets precompiled.
Merge pull request #137 from indykish/0.5

fix to make the assets precompiled.