Merge changes from GateIn 3.7 for webui.core
Merge changes from GateIn 3.7 for Javascript
Merge changes from GateIn 3.7 for Templates