Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
added the user roles method
Merge remote-tracking branch 'upstream/mobile'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/mobile'
changed all the titles
added google maps jquery mobile plugin, fixed merge conflicts
Merge remote-tracking branch 'upstream/mobile'
fixing forms and layout for event show page
fixed conflicts
finished event show, still have issues with the driver name for multiple carpools with the same user id and the datebox in the edit form
Merge pull request #79 from duanw/master

finished event show page