CRM-12930 related small fix

----------------------------------------
* CRM-12930: CRM/Core/BAO/MessageTemplates.php does not obey CIVICRM_MAIL_SMARTY
  http://issues.civicrm.org/jira/browse/CRM-12930
Merge pull request #1376 from monishdeb/CRM-12930

CRM-12930 related small fix
Revert "Merge pull request #1371 from drumm/CRM-12930-smarty-safe-mode"

This reverts commit 94ee5a7f70c82520c5ff4c736d5e6638ec49e780, reversing
changes made to a487a4bf777638a15e079baa489eabf13a7e035d.
Revert "Merge pull request #1376 from monishdeb/CRM-12930"

This reverts commit ab705a177447f37bbc6ee107a79927ca13498343, reversing
changes made to c77d25a7703832e635e36ef92192a278e42fc8e7.
Revert "Merge pull request #1368 from drumm/CRM-12930-smarty-compile"

This reverts commit 30ffbdf089db87d9cf2905939f84348a0b03b5e1, reversing
changes made to 94ee5a7f70c82520c5ff4c736d5e6638ec49e780.
Merge pull request #1377 from kurund/CRM-12930

CRM-12930, reverting commits associated with this issue
Update ReloadOption.php
CRM-10935 - CRM/Core/xml/Menu/Contact.xml - Fix malformed permissions

----------------------------------------
* CRM-10935: Create new Core Permission - CiviCRM: Access own Contact or both "CiviCRM: View own Contact"  and "CiviCRM: Edit own Contact"
  http://issues.civicrm.org/jira/browse/CRM-10935
Merge pull request #1379 from totten/master-viewperm-fix

CRM-10935 - CRM/Core/xml/Menu/Contact.xml - Fix malformed permissions
CRM-12930 Always use Smarty security for string templates
Merge pull request #1380 from totten/master-reapply-1371

CRM-12930 Always use Smarty security for string templates
Merge branch 'master' of git://github.com/civicrm/civicrm-core into CRM-12778
CRM-12778 --refactored code to remoce junk functions