url is parsed with location data as well as username
Merge branch 'master' of https://github.com/hesandoval/yoamisafe

Conflicts:
	yoamisafe/urls.py
	yoamisafe/views.py