removed catroid references in source code; updated e-mail tests.
Merge branch 'design' of github.com:Catrobat/Catroweb into design