change intent after photo taken, onclick window info on map, ...

+ dont go back to photo and upload activity