Updating CMS to newest version
ignore htaccess
template fixes
Merge branch 'CMS-Update'