Fix NPE
Added cancel button to categories and school year tables
Merge pull request #797 from jidel/issue#773_abort-button

Issue#773 abort button