add LocationSelector Function and remove all 'discover' used in html
Merge branch 'master' of https://github.com/popsup/popsup

Conflicts:
	protected/controllers/DiscoverController.php