CP style iImprovements
Merge branch 'master' of github.com:cloice/cloice

Conflicts:
	client/styles/global.less
Merge branch 'master' of github.com:cloice/cloice

Conflicts:
	client/styles/global.less