add google and baidu verify
add new icon
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/WEB-INF/views/home.jsp
	src/main/webapp/WEB-INF/views/robots.txt