Joseph's changes on experience_detail page
experience/form
Merge branch 'yi'
Fix a bug in the search page, line 547: should use user_id instead of id
Merge branch 'yi'
comment out an unused url addexperience
Merge branch 'yi'
Fix a bug in the booking confirmation page: the user can't change the booking information when they return to this page due to missing required information
Merge branch 'master' of https://github.com/tripalocal/version-1.0

updajnfls
e

syncmaster
Merge branch 'master' into jqhils

fc branch.
sage aborts the commit.