add tracking configs to the media module
fix new media spec
Merge branch 'master' into feature-media

Conflicts:
	_site/changes.html
	_site/dist/js/analytics.js
	_site/index.html
	_site/test.html
	_site/test/reports/TEST-AnalyticsTest-Debug.xml
	_site/test/reports/TEST-AnalyticsTest-Errors.xml
	_site/test/reports/TEST-AnalyticsTest-Events.xml
	_site/test/reports/TEST-AnalyticsTest-LinkClick.xml
	_site/test/reports/TEST-AnalyticsTest-ManualTrigger.xml
	_site/test/reports/TEST-AnalyticsTest-PageLoad.xml
	_site/test/reports/TEST-AnalyticsTest-Search.xml
	_site/test/reports/TEST-AnalyticsTest-Variables.xml
	dist/js/analytics.js
	test/reports/TEST-AnalyticsTest-Debug.xml
	test/reports/TEST-AnalyticsTest-Errors.xml
	test/reports/TEST-AnalyticsTest-Events.xml
	test/reports/TEST-AnalyticsTest-LinkClick.xml
	test/reports/TEST-AnalyticsTest-ManualTrigger.xml
	test/reports/TEST-AnalyticsTest-PageLoad.xml
	test/reports/TEST-AnalyticsTest-Search.xml
	test/reports/TEST-AnalyticsTest-Variables.xml
updated with code from current master
fa: added tests for new media-feature (in progress)
Merge branch 'feature-media' of https://github.com/bskyb-fa/analytics into bskyb-fa-feature-media

Conflicts:
	_site/test/unit/specs/time-parting-spec.js
	test/unit/specs/time-parting-spec.js
Merge branch 'bskyb-fa-feature-media'
BF|SV: added media plugin and version bump
BF|SV: build files for new release