add style css
Merge branch 'master' into ClassPage

Conflicts:
	protected/runtime/application.log