build
Merge branch 'master' of github.com:jasonknight/salor-bin

Conflicts:
	debian/changelog
fopen instead of open to fix drawer issues
Merge branch 'upstream'
build