fixed date in intervals
Merge pull request #260 from musamusa/bug/stock-count-intervals

fixed date in intervals
fixed variable name
Merge pull request #261 from musamusa/bug/stock-count-list

fixed variable name
removed log messages
merged upstream
fixed stock counting unit bug
Merge branch 'upstream-develop' into fix/stock-count-units

Conflicts:
	app/scripts/controllers/home.js
fixed stock counting unit bug