Merge branch 'hotfix-issue-21'
Users can always view their own photos.

Update to check that the logged in user is the same as the
photo.user. If so then the photo page can be viewed even
when the competition is still open to submissions.
Merge branch 'develop'
Disable upload form during upload

Some js which overlays a div on the upload form to stop
users from pressing buttons while the file is uploaded.
Merge branch 'master' into develop