Apply same changes to master that were done with Dev
Merge pull request #828 from sinfuljosh/master

bring templates back in sync
Merge pull request #67 from nZEDb/master

Apply same changes to master that were done with Dev