Merge remote-tracking branch 'origin/master' into 3.1

Conflicts:
	helpers/Helper.helper.php
	helpers/SmartySingleton.helper.php
Moved the Template Finding Code to the SmartyHelper Class instead of the Helper class plus did a little refactoring
code cleanup