Partial Homepage design integration
Merge branch 'master' of github.com:fashioncache/fashioncache

Conflicts:
	inc/functions.inc.php
	index.php
Merge branch 'master' of github.com:fashioncache/fashioncache

Conflicts:
	inc/functions.inc.php
	index.php