1.47_fan

Conflicts:
	Public/Home/css/style.css
Merge branch 'master' of https://github.com/ghcf2014/GICA
Merge branch 'master' of https://github.com/ghcf2014/GICA