Temple's updates
Merge branch 'master' of https://github.com/Xalor/Tempbiak

Conflicts:
	project/app/view/css/style.css
	project/app/view/temp/header.php

Merge and update