added two row main activity menu
Merge branch 'upstream-develop' into refactor/create-two-accordion-main-menu
removed unecessary $scope.$apply() from storageService.loadFixture();
Merge pull request #165 from jofomah/refactor/create-two-accordion-main-menu

Refactor/create two accordion main menu