Integrating changes with main fork.
-
Fixed small bug with photos -- it appears as though they are not being
removed from the Db properly though at the moment.  Will look into it.