Merge branch 'master_design' of intra.ist.tugraz.at:catrobat/catroweb into master_design
WEB-37
Merge Conflict fixed