added location to user and location based discover api endpoint
Merge remote-tracking branch 'origin/dev'

Conflicts:
	build.gradle
	test-environment/api-manifests/init.pp