Updates to image uploading and login/registration forms
Merge remote-tracking branch 'origin/master'