Calendar Tabs and Color Picker

Color picker does not change selection color.
Merge branch 'master' of https://github.com/ejohnson44/TeamMeet

Conflicts:
	calendar.html
Merge pull request #5 from rcrl3/master

Calendar Tabs & Color picker
Merge branch 'master' of https://github.com/ejohnson44/TeamMeet
Formatting updates
Added template
Merge pull request #6 from rcrl3/master

Added Template to Calendar
Merge branch 'master' of https://github.com/ejohnson44/TeamMeet
added in pacos stuff
updated importing - now creates checkboxes for calendars and displays all busy times in the selection
Merge branch 'master' into google_cal

Conflicts:
	calendar.html