Final
fon
Merge branch 'master' of github.com:lftechnologyinc/hack_fusion

Conflicts:
	protected/views/site/index.php
asd
Merge branch 'master' of github.com:lftechnologyinc/hack_fusion