Adding a pseudo-associate playlist to location screen.
Merge branch 'master' of https://github.com/darkcrawler01/Hollywood_hackday

Conflicts:
	Hackathon/AndroidManifest.xml
	Hackathon/res/values/strings.xml