Completed color controller submission and form modification.
Completed all basic functionality and new routing on form. Working on asset upload.
Fixed merge conflict.
Completed carrierwave uploader for Miscelleous Assets.
Completed basic form and file submission.