Merge branch 'deletePhoto' into dev

closes #13