location field corrected
Merge branch 'master' of https://github.com/fandang0/iwashere

Conflicts:
	iwashere/globe/views.pyc