refine data model
Merge branch 'master' of https://github.com/Zeke-Y-Liu/StreetRanger.git

Conflicts:
	Ranger/collector/src/main/java/com/ranger/collector/Collector.java
resolve conflicts
resolve conflicts