Remove the comments that were obscuring my CSS.
More files whose changes we don't care about.
Merge remote-tracking branch 'origin/master'

Conflicts:
	showTrains/src/main/java/com/jettmarks/routes/client/rep/RouteContainerImpl.java
	showTrains/src/main/resources/com/jettmarks/routes/public/css/progressBar.css