Merge branch 'master' into marty
Merge branch 'master' into marty
Accessories, adjustments, and search field changes

Added QUANTITY field to accessoriesdb and quantity textfield to
accessory detail view

Removed images from Accessories list, added Category headers in list.

Added logic to display proper number for discounted adjustments

Removed percentage checkbox from Adjustments

Added user list for search results, and logic to search on last name
and/or address

Fixed bug with Inspection not displaying properly

Added code in for photo upload
Merge branch 'marty'
Merge branch 'master' into Adam-Jones
Merging my brnch
All the checks for Roof Info subsections
Merge branch 'Adam-Jones'
Merge branch 'Dustin'
Merge branch 'master' of https://github.com/militantjones/estimator

Conflicts:
	main.wire
Merge branch 'master' into Dustin