minor modification to lms229calendar.js
merged in from master
merged in from upstream
Stumped out controller functions for create event, delete event, view course cal and view user cal
Calendar updates and bug fixes.

controllers/calendar.py - added auth logic to all actions
models/dbcal.py - added CalendarEvent object, methods and fixed bugs.
views/calendar/index.html - I had created this view for testing, so I’m
including it in case we need it for something.
Merge pull request #5 from bpatzke/master

Calendar updates and bug fixes.
minor modifications to calendar js
Merge branch 'master' of https://github.com/MSherry24/lms299 into dev
merge from upstream
Merge branch 'master' of https://github.com/MSherry24/lms299
Merge branch 'master' into dev
Create bootstrap.min.js
Create basictemplate.html
Edited the template
beginning work on course_calendar. Worked out method for passing json from web2py to fullcalendar
removed debug statement from course_calendar view
Merge pull request #57 from drkaff/master

Bootstrap Group
Merge pull request #56 from MSherry24/master

Bug fixes to calendar db tables and stumped out controller functions for calendar.py
Merge branch 'master' of https://github.com/mdipierro/lms299

Conflicts:
	models/dbcal.py