Update Password
Merge branch 'master' of github.com:Eduki/eduki into update-password

Conflicts:
	app/assets/javascripts/models/user.js
Merge pull request #186 from Eduki/update-password

Users can now update their passwords.