Added Controller Functions

Added Controller functions related to database access in
controllers\groupchat.py. Reordered the user_id parameter in a couple of
functions in group_chat.py.
Added update user settings to group chat

Added the function update_user_group_chat_settings to the model. Added
add_user_settings_default and update_user_settings to controller.
group chat history by user

The group chat history page now displays group chats only for the logged
in user.
Merge branch 'master' of https://github.com/jjunk/lms299

Conflicts:
	controllers/groupchat.py

Method to retrieve chat history # of arguments conflicted resolved.
Update calendar.py
Update menu_cal.py
Update create.html
Fixed Errors

Fixed a few errors in the controller
Merge remote-tracking branch 'origin/master'

Conflicts:
	controllers/groupchat.py
Merge pull request #14 from Saher-/master

3 new commits 
Thanks, Saher!
Merge pull request #81 from jjunk/master

group chat controller & history update
Merge pull request #80 from MSherry24/master

Calendar Group - Minor changes to create/edit/delete events pages
Merge branch 'master' of https://github.com/mdipierro/lms299