Fixed photo upload
Merge branch 'develop' into login