small fix and wiped out old grants code
Merge branch 'newgrants' into testing
Merge branch 'testing' of https://github.com/sharewave/frontus into testing