Styled live-edit form, fixed Angular
Fixed controller to allow editing of descriptions
Changed styles on live-edit form
Removed console message from charts.js
Fixed merge conflict