changes to photo_controller and show.html.haml
Merge branch 'development' of github.com:tmerlet/Photoapp into development