Merge branch 'develop' into stock-count-summary

Conflicts:
	app/scripts/services/stockcount.js