start redoing models and views
model changed
Merge branch 'make-color-and-finish-belong-to-user-lacquers'