Added an option controller to disable geolocation component
Merge pull request #69 from BBC-Location-Services/68-disable-geolocation

Issue 68 - Added an option controller to disable geolocation component
Merge branch 'master' into 66-disable-preferred

Conflicts:
	src/example/primary/main.js
	src/js/controller/primary.js
	test/specs/controller/primarySpec.js