"mvn compile -P protoc" was deleting all of the non-generated java files
Merge branch 'master' of https://github.com/PTIPS/GTFS-tests.git

Conflicts:
	pom.xml