style commit
Merge branch 'feature-4-uiexamples' of
https://github.com/ten24/Slatwall.git into feature-4-uiexamples

Conflicts:
	admin/client/css/main.css