getLocation route
merge master