Merge pull request #45 from kguischard13/master

Service Class, for users, and course
note Controller, Note Service and Beans update
Merge branch 'master' of https://github.com/Caf131/com-virtual-app into dev-chris

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Merge pull request #46 from Caf131/dev-chris

Dev chris
Note Controller Update and Beans.XML
Merging Conflicts
Merge pull request #48 from Caf131/dev-chris

Dev chris
Removed duplicate files as a result of Merge
Merge pull request #49 from Caf131/dev-chris

Removed duplicate files as a result of Merge
Note Service Class, Note Service Test, Live Discussion Service

All my service classes and cleanup of the Home Controller
Merge pull request #50 from Caf131/dev-chris

Note Service Class, Note Service Test, Live Discussion Service
Live Discussion Service
Merge pull request #51 from Caf131/dev-chris

Live Discussion Service
Merge pull request #52 from kguischard13/master

Updated Data, Service Class to Match New DataBase
Update to NoteController, Note, Note Service
Latest Merge
Deleted Student and Teacher Class
Merge pull request #53 from Caf131/dev-chris

Dev chris