Changed names of action functions. Bug fixes.
Merge branch 'working-copy'
Bug fixes. Updated the names of the controller functions.
Merge branch 'master' of https://github.com/msherry24/lms299
Forgot to re-add file after name chnage.
Fixed bug from function name changes.
Fixed a bug caused by the aciton name changes.
Merge pull request #11 from bpatzke/master

Changed names of action functions. Bug fixes.
Update calendar.py
Update menu_cal.py
Merge pull request #12 from Saher-/master

Delete()
-Merging in changes from Saher. -MS
Added field to recordings database, added to create method, altered edit method
Merge branch 'master' of https://github.com/MSherry24/lms299
Update menu_cal.py
Update dbcal.py
Modified recordings view to show recording list
Merge pull request #13 from Saher-/master

issues solved
-Looks good Saher. Thanks.
Added edit view, added edit button to recording index view for teachers, modified edit controller to update database on form submit
Added tweaks to allow callback from Hangouts app. Bad security now, though.
Merge pull request #73 from jjunk/master

retrieval messages for group chat messages & user settings
Merge pull request #74 from MSherry24/master

Calendar group - Changes to delete function and better function naming