Duh
sdwdMerge branch '0.5' of https://www.github.com/megamsys/nilavu into 0.5
orgfix
Merge pull request #130 from morpheyesh/0.5

0.5
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
take a tour changes