ajax photo delete and default date in migration
added display_date method to photo model
tweaked photo info display and photo upload area
fixed js selectors
resolve conflict
Merge pull request #28 from th7/trip_controller

Trip controller