slight changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	Implementation/src/virtualcity3d/screens/NeighborhoodTestScreen.java
slight changes