[+FEATURE] Add new and edit actions with blocks
Merge branch 'master' of github.com:MagentoHackathonUK2014/Magehack_Autogrid