Commit before merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	EvaluationFunctions.java
Only 13/17 features integrated. MinAltitude not used, bug with contactarea. LinesSent and InvertedWeightedholecount not integrated also.