Home layout ok
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/php.xml
	ClientPages/Css/From Cartoon Blocks.ttf
	ClientPages/Css/orange juice 2.0.ttf