now passing photo object between scratch and edit is working
fixed conflict in editactivity