Update Code
Merge branch 'master' of https://github.com/Xalor/Tempbiak

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

merger
add update code