Fixing deleteUnderlying to include converts and prettifying modal
Merge branch 'awesome' into testing
Merge branch 'testing' of https://github.com/sharewave/frontus into testing