[Sync] Project sync from Zero
Merge branch 'Rel19' of http://github.com/mangosone/server into Rel19