ticket:5 Making css and js
Merge branch 't5_make_editable'