add blocks
add boilerplate blocks methods and views
fix blocks form and controller
Merge branch 'master' of github.com:AUCS/website