new face
new layout
commit
commit
Merge branch 'master' of github.com:ycaihappy/mu
Merge branch 'master' of github.com:ycaihappy/mu

Conflicts:
	code/webroot/themes/classic/views/site/index.php