add "1 w/ col adj" to screendisplay
add "1 w/ col adj" to screendisplay
customer count customizations for ELFCO
Assign change type via Tender Module
Merge branch 'master' of https://github.com/joelbrock/ELFCO_CORE into upgrade

Conflicts:
	fannie/reports/CustomerCount/index.php
	pos/is4c-nf/lib/Tenders/TenderModule.php