PhotoController: Added some more descriptive response headers
Merge branch 'master' into deploy