fixes for profile
Merge pull request #111 from thomasalrin/0.5

ssh_key creation
Merge remote-tracking branch 'origin/0.5' into 0.5

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/users_controller.rb
Profile, Password, SSH Keys
Merge pull request #113 from indykish/0.5

0.5 fixes for sshkeys, profile and delete v1 api.
Merge branch '0.5' of https://github.com/thomasalrin/nilavu into thomasalrin-0.5

Conflicts:
	app/views/ssh_keys/_sshkeys.html.erb
Merge branch 'thomasalrin-0.5' into 0.5
Merge remote-tracking branch 'origin/0.5' into 0.5
settings creation