Made some changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/users/my_profile.html.haml
Small layout issue