Fixed issue spotted in updating user profile
Merge branch 'master' of https://github.com/Chps/Pyc

Conflicts:
	app/views/users/show.html.haml