Remove Stupidness
Merge remote-tracking branch 'origin/master' into test

Conflicts:
	route/src/CompileSearchDataRoute.java