Changing next buttons
Fixing merge conflicts
Merge branch 'grants_wizard' of https://github.com/sharewave/frontus into grants_wizard
Merge branch 'grants_wizard' into testing