Freeislife Version 1.0
使用Glyphicons图标
Merge branch 'feature-icon' into develop

Conflicts:
	Anfield/index.php
	Anfield/style.css
Revert "使用Glyphicons图标"

This reverts commit 9ff01ac0f3f6ca2fbbfe640fd58ed62efbc65018.

Conflicts:
	Anfield/style.css