omg
Merge remote-tracking branch 'origin/master'

Conflicts:
	Server/SQLFunctions.cpp
Merge branch 'master' of https://github.com/clethrill/sys-dev

Conflicts:
	Server/SQLFunctions.cpp