Merge origin/feature/offline-analytics into feature/offline-analytics

Conflicts:
	app/scripts/directives/analytics.js
	app/scripts/services/analytics-sync-service.js
	app/scripts/services/tracking-factory.js