small link bug fix
Merge pull request #138 from morpheyesh/0.5

small link bug fix
Merge pull request #139 from thomasalrin/0.5

login, no ssh key alert
myprofile input textfields get enabled when "Change" is clicked.
Merge pull request #140 from indykish/0.5

myprofile input textfields get enabled when "Change" is clicked.
Include the fake demo user.
fix app request and status
Merge pull request #141 from indykish/0.5

Include the fake demo user.
Merge branch '0.5' of https://github.com/rajthilakmca/nilavu into 0.5

Conflicts:
	app/assets/stylesheets/custom.css
Merge remote-tracking branch 'origin/0.5' into 0.5
bumped megam_api gem version to 0.20
Merge pull request #143 from indykish/0.5

bumped megam_api gem version to 0.20
nilavufix
cwedfw
Merge remote-tracking branch 'origin/0.5' into 0.5
ok
fix
s
Merge pull request #144 from morpheyesh/0.5

0.5
fix org, in view.
Merge remote-tracking branch 'origin/0.5' into 0.5