add/edit block
add helper
add js
Merge branch 'master' of https://github.com/marius-grad/hackathon_ro_2014
correction
Merge branch 'master' of https://github.com/marius-grad/hackathon_ro_2014
Merge branch 'master' into Bob