Fixing nil item issues
New compl
removing new completeorderpopup stuff
Merge branch 'debian_4_0_1_12' into merger

Conflicts:
	salor-retail/app/assets/stylesheets/workstation.sass
	salor-retail/app/views/layouts/application.html.haml
	salor-retail/app/views/orders/_line_items.html.erb
	salor-retail/app/views/shared/_application_js.html.erb
	salor-retail/public/images/ui-bg_diagonals-thick_15_0b3e6f_40x40.png
Allow assistant manager to delete items, but not edit employees
Merge branch 'master' of github.com:jasonknight/salor-retail