More touch-ups
Merge remote-tracking branch 'origin/master'

Conflicts:
	Middleman/Middleman/src/main/java/com/team/hv/middleman/middleman/RouteView.java
Merge remote-tracking branch 'origin/master'
More touch-ups