1.90_fan
Merge branch 'master' of https://github.com/ghcf2014/GICA

Conflicts:
	Application/Home/View/default/Index/index.html