Removes collapsing nav, closes item:317
Merge pull request #172 from tlvince/refactor/nav

Removes collapsing nav, closes item:317
Update grunt-imagemin
Merge pull request #173 from tlvince/refactor/imagemin

Update grunt-imagemin
chromeStorageApi unit tests refactored
Merge pull request #174 from m0t0r/feature/chromestorageapi-unit-tests

chromeStorageApi unit tests refactored
changed stock count counter to numeric type
Merge branch 'upstream-develop' into feature/enhance-counter

Conflicts:
	app/scripts/directives/counter.js
	app/styles/main.css