Merge branch 'develop' into ux
Move form for adding photos into edit photos page

Add links for edit, share and photos to trip view page
Merge branch 'ux' into develop