Fixed problem with edit profile added image resizing
Merge branch 'master' of https://github.com/marniescully/p2.marniescully.biz

Conflicts:
	uploads/avatars/34.JPG