Upload photo form displays as a modal
Merge branch 'development'