[Sync] Some small project sync
Merge branch 'Rel19' of http://github.com/mangosone/server into Rel19