added two row main activity menu
Merge branch 'upstream-develop' into refactor/create-two-accordion-main-menu
removed unecessary $scope.$apply() from storageService.loadFixture();
changed stock count counter to numeric type
Merge branch 'upstream-develop' into refactor/change-to-numeric-type-counter
added fastclick to index.html
Merge pull request #165 from jofomah/refactor/create-two-accordion-main-menu

Refactor/create two accordion main menu
0.5.0
Merge pull request #168 from futuresandwich/task/bump_v050

0.5.0
Merge branch 'develop' into feature/waste-count-form

Conflicts:
	app/views/home/main-activity.html
angular-translate -> chrome.i18n first pass
Use i18n factory, rm redundent httpbackend mocks
Simplify dashboard factory keys
Update dev deps, closes item:356
Fix i18n factory invocation
added reload state to load fixtures after clearing local storage
added beep and vinration notifications to counter Refs item: 350
changed stock count counter to numeric type
Merge branch 'upstream-develop' into feature/enhance-counter

Conflicts:
	app/scripts/directives/counter.js
added test for notification service Refs item: #350