upload file update, added empty view and controller end point
Merge branch 'master' of github.com:danielisler2/lms299 into develop
Merge github.com:mdipierro/lms299 into develop
drop databases
Merge branch 'master' of https://github.com/matus85/lms299

Conflicts:
	databases/c8b669d15150d7109e5f7ab36744a5b7_course.table
	databases/c8b669d15150d7109e5f7ab36744a5b7_course_section.table
	databases/c8b669d15150d7109e5f7ab36744a5b7_membership.table
"fixed errors in db1.py and dbcal.py"
Merge branch 'master' of https://github.com/matus85/lms299

Conflicts:
	models/db1.py
	models/dbcal.py
Resolve conflicts in db1.py and dbcal.py
Merge branch 'master' of https://github.com/matus85/lms299
Merge branch 'master' of https://github.com/matus85/lms299
Merge github.com:mdipierro/lms299 into develop
method to get user group chat settings
method to get group chat messages for a session
Merge remote-tracking branch 'upstream/master'
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.