Merge pull request #1 from mambax7/master

Latest changes from Voltan
moving assets to /assets, renaming Smarty template file extensions to .tpl