Refactor brick map.
Add test for category brick factory
Refactor failed tests caused by new brick category factory
Fix NullPointerException in MainMenuActivityTest.
Merge branch 'master' into RefactorAddCategoryBricks
Merge pull request #398 from Catrobat/RefactorAddCategoryBricks

Refactor add category bricks