Merge branch 'develop' of github.com:Benn83uk/SpaceAppsChallenge2014 into develop
Merge branch 'develop' of github.com:Benn83uk/SpaceAppsChallenge2014 into develop
Merge branch 'master' of github.com:Benn83uk/SpaceAppsChallenge2014
display success page on photo upload
change caching to 1 minute
Merge branch 'develop'