fixes issue #336

fixes issue #336

Conflicts:
	crm/modules/profile_picture/profile_picture.inc.php
Update version number.