Fixing some issues with photos not updating and not disappearing when deleted
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/layout/dialog_custom.xml