updated to latest css
Merge branch 'master' into baseApplication

Conflicts:
	css/style.less