added geo search
Merge branch 'master' of https://github.com/aerobats/nstagram

Conflicts:
	js/controllers/searchCtrl.js