misc updates
ignore update
misc ignore update
merged UI branch
Merge branch 'Validation'
Merge branch 'development'

Conflicts:
	application/controllers/employee_controller.php
	application/controllers/site_controller.php
	application/models/item.php
	application/models/user.php
	application/views/adminH.php
	application/views/bChkList.php
	application/views/contact.php
	application/views/editDelivery.php
	application/views/getStarted.php
	application/views/settings.php
Header links to the modals properly moved settings scripts to the adminH page.
removed duplicate js