Updated UML
Fixed photo imageview bug
Merge branch 'matt'