changed the modified tpl file from 'home1' to 'home' and the css file
'style1' to 'style'

changed the corresponding name of tpl file in the control class home.php
modified the control class home and navigation
Merge branch 'master' of https://github.com/davcri/Unibox.git

Conflicts:
	index.php