Merge branch 'master' into Dustin
Deleting photo bugs sorted out
Merge branch 'Dustin'