WEB-35
Merge branch 'master_design' of github.com:Catrobat/Catroweb into master_design