Proper avatar resizing
Merge branch 'master' of https://github.com/qweeky/qweekyapp

Conflicts:
	qweek/ViewControllers/Settings/ProfileViewController.m