Merge branch 'master' of https://github.com/jjunk/lms299

Conflicts:
	controllers/groupchat.py
Merge branch 'master' of https://github.com/jjunk/lms299

Conflicts:
	controllers/groupchat.py
Merge branch 'master' of https://github.com/jjunk/lms299
user chat settings

Added method to set a user's Hangouts settings such as if they want the
mic or camera disabled.
Merge remote-tracking branch 'upstream/master'
user chat settings function parameters updated

The parameter name have been updated to more closely match Google+ Hangout
API.
Changed Controller Functions

Removed init_chat and added insert_new_hangout and
update_existing_hangout
Changed and removed tables

Changed the table group_chat_session since it no longer needs a title
field, and removed the group_chat_session table since we ont be using
it. Added  update_group_chat_session function.
Merge branch 'master' of https://github.com/jjunk/lms299
Merge branch 'master' of https://github.com/jjunk/lms299
Added user settings controller functions

Added and changed functions relating to setting the microphone and
camera settings for the user.
Added user settings functions

Added update functions for updating the settings for microphone and
camera.
Merge branch 'master' of https://github.com/jjunk/lms299
Remove target from link

Removed target="_blank" from link so that the link will open in the same
tab opposed to a new tab. The link has to open in the same tab due to
security issues.
Added back group_chat()

Added the group_chat() function which was removed previously
Merge branch 'master' of https://github.com/jjunk/lms299
Fixed function name

Changed microphone to camera
callbacks for updating user settings

Callbacks are now registered for when the user either mutes their camera
or microphone. Theses callbacks will make AJAX calls to the LMS299 web2py
instance to store these settings so that they can be used the next time a
user enters a chat.
Adding an onclick button to the image "start hangout"
comments added for group chat JavaScript