Merge upstream/develop into defect/stock_level_graph

Conflicts:
	Gruntfile.js
	app/_locales/en/messages.json
	app/index.html
	app/manifest.json
	app/manifest.mobile.json
	app/scripts/app.js
	app/scripts/controllers/app-config.js
	app/scripts/controllers/clear-storage.js
	app/scripts/controllers/home.js
	app/scripts/controllers/index.js
	app/scripts/controllers/stock-count.js
	app/scripts/db.js
	app/scripts/decorators/exceptionhandler-decorator.js
	app/scripts/directives/analytics.js
	app/scripts/services/analytics-sync-service.js
	app/scripts/services/app-config-service.js
	app/scripts/services/background-sync-service.js
	app/scripts/services/chrome-storage-api.js
	app/scripts/services/memory-storage-service.js
	app/scripts/services/notification-service.js
	app/scripts/services/pouch-storage-service.js
	app/scripts/services/stock-count-factory.js
	app/scripts/services/storage-service.js
	app/scripts/services/sync-service.js
	app/scripts/services/tracking-factory.js
	app/scripts/services/tracking-service.js
	app/scripts/services/utility.js
	app/views/app-config/edit-configuration.html
	app/views/app-config/partials/forms/facility-info.html
	app/views/stock-count/index.html
	bower.json
	config/development.json
	config/production.json
	config/test.json
	nbproject/project.properties
	nbproject/project.xml
	package.json
	scripts/build.sh
	test/spec/controllers/stock-count.js
	test/spec/controllers/stock-out-broadcast.js
	test/spec/services/background-sync-service-spec.js
	test/spec/services/storage-service.js