build
Merge branch 'master' of github.com:jasonknight/salor-retail
reduced chance of db overwrite in seeds. js comment was ineffective for erb
Merge branch 'master' of github.com:jasonknight/salor-retail
build
build
build
added /var/tmp to debian installation
Feature #1620 Configure printers by name rather than device path, and automatically detect device path when going to orders#new
Merge branch 'master' of github.com:jasonknight/salor-retail

Conflicts:
	salor-retail/db/schema.rb