[Core] Amendments:anger control and Superposition of combustion
Merge branch 'Rel19' of http://github.com/mangoszero/server into Rel19