checking in street data
new street data and details
merged stuff
Merge branch 'feature/street' into HEAD

Conflicts:
	data/street.data