Revert "test+"

This reverts commit f6d500a07977e75c884f0f2e9be2524dc751394b.
Merge branch 'master' of https://github.com/EasyLovine/ZencTbi

Conflicts:
	includes/templates/theme317/common/tpl_main_page.php