Locked devise
Resolved merge conflicts
Added substantial UI clean up
Merge pull request #47 from getquant/feature/CRUD

Feature/crud