new model ItemStock
Work on itemstock
Closes feature #1652
More work on item_stocks and item_shippers, just adding some convenience
Employee Logins
latest
xxx
Time Picker for Employee Logins
Edit Employee Logins
Closes features #1655, #1654, #1653
 delete_order_item.js.erb needs to update Order
Merge branch 'master' of github.com:jasonknight/salor-retail into new_item_locations
Merge branch 'master' into new_item_locations

Conflicts:
	salor-retail/app/models/vendor.rb
	salor-retail/db/schema.rb
Fixing actions based on cats
various
timepicker css
Fixing employees error
xxx
Merge branch 'debian_4_0_1_12' into new_item_locations

Conflicts:
	salor-retail/app/views/orders/delete_order_item.js.erb
Finished unpaid orders