Updated Server 1.2.2
Merge remote-tracking branch 'origin/master'

Conflicts:
	CS307UPLOAD/databaseInterface.cpp
	CS307UPLOAD/handler.cpp