Add http://filepicker.io to the "Create Trip" dialog
Merge remote-tracking branch 'origin/master'