Adding front end to delete eliza.
Fixing merge conflict.
Merge branch 'testing' of https://github.com/sharewave/frontus into testing