quick fix on datepickers in photo edit form
Merge remote-tracking branch 'origin/quick_fix' into controller_tweaks
merge with quick_fix