Update order detai;
Push all current content
Css

Clean
create item

fix conflict
Merge branch 'develop-4' of https://github.com/ten24/Slatwall into feature-4-uiexamples

Conflicts:
	admin/client/css/main.css
	admin/client/partials/editorderitems.html
	admin/layouts/default.cfm
	admin/views/main/html-order-detail.cfm
	config/configApplication.cfm
Collections changes
Merge branch 'develop-4' of https://github.com/ten24/Slatwall into feature-4-uiexamples
Merge branch 'develop-4' of https://github.com/ten24/Slatwall into feature-4-uiexamples
Add search to nav
Merge pull request #2450 from ten24/feature-4-uiexamples

Feature 4 uiexamples