style refactoring
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/pages/user/cabinet.xhtml
style refactoring