Merge branch 'hotfix-issue-21' into develop
Alert user to scoring competitions

Added an alert to the user's page if there is a scoring
competition which requires the user to submit scores.
Merge branch 'scoring-notification' into develop
Refactor competition.py
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
Competitions page: user info when no logged in user

The page was showing the text 'No photograph submitted'
even when no user is logged in. Add an extra check for a
user on the html template to stop the display of certain
information when no user is logged in.
Merge branch 'develop'
User page: no photos can be submitted

Improved wording of message to user when they cannot submit
a photograph.
Merge branch 'develop'