update:增强ie6兼容性，避免使用多类选择器
Merge remote-tracking branch 'origin/master'

Conflicts:
	views/layout.html
merge:layout.html