Updated to include a page for the Display Features at https://developers.google.com/analytics/devguides/collection/analyticsjs/display-features
Minor changes
Merge branch 'master' of Xaniff/universal-analytics-migration into Xaniff-master

Conflicts:
	content/index.twig