added popup for photo options in create/edit and added photo preview in ViewPhotos
merge conflicts should be fixed
okay really fixed now