Need to merge
Merge remote-tracking branch 'origin/master'
Add main photo
Add editing and photo loading
Merge remote-tracking branch 'origin/master'