Merge branch 'master' into requests
Trip update!

Added ability to copy field trips
Added dropdown calendar
Removed trip leader email
Made trip start and end times start at 8am and 5pm respectively
Merge branch 'requests'