renamed trip_controller.rb
Merge remote-tracking branch 'origin/master'
remove unused variable assignment, correct param usage
check place_response[0] exists
fix params used to test update
update specs, remove unused code
ajax photo delete and default date in migration
added display_date method to photo model
fewer warnings in log
remove unused file
tweaked photo info display and photo upload area
working background jobs
fixed js selectors
resolve conflict
Merge branch 'bugfix' into rspec
Merge pull request #29 from th7/usability

Usability
Merge pull request #30 from th7/background_jobs

Background jobs
Merge pull request #27 from th7/rspec

update specs, remove unused code
resolve conflict
Merge pull request #28 from th7/trip_controller

Trip controller