Merge upstream/develop into feature/offline_analytics

Conflicts:
	app/scripts/app.js
	app/scripts/services/storage-service.js