fixed estimate quick add for all columns
fixed project to have proper settings attributes
fixed conflict
Got most of user structure working
Merge branch 'project_settings'

erging branch with master
merged users with master