Merge branch 'master' into James-Local-Sync
Merge branch 'James-Local-Sync' of https://github.com/FIU-CIS-SeniorProject/MobileClinic into James-Local-Sync
Confirm Purge
Merge branch 'master' into James-Local-Sync
Active User Implementation
Merge branch 'James-Local-Sync'
Merge branch 'myBranch'
Humberto
Merge branch 'master' of https://github.com/FIU-CIS-SeniorProject/MobileClinic

Conflicts:
	Source Code/Local Server/BaseObject.h
Update Faces
Merge branch 'master' into Ernesto's-Branch