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

Conflicts:
	module/index.php
	view/index/index.php