Merge branch 'refs/heads/master' into develop
Fixed Tpl.php
Merge branch 'refs/heads/develop'