add animate style
delete ignore files
Merge remote-tracking branch 'origin/yuguiqi'
Merge remote-tracking branch 'origin/master' into yuguiqi
Merge remote-tracking branch 'origin/gtc' into yuguiqi

Conflicts:
	WebRoot/WEB-INF/fornt/header.html
	WebRoot/WEB-INF/fornt/index.jsp