Add change password page
Test change password route
Merge branch '25_change_password'

Conflicts:
	locale/en/user.yml
	routes/users.rb
	views/layouts/_header.haml