Merge remote-tracking branch 'origin/dev-frontend_0804' into dev-frontend_0804

# Conflicts:
#	frontend/src/views/Photography/detail.vue