added territory eval
.
Merge branch 'master' into Felix

Conflicts:
	src/evaluation/Evaluation.java
	src/evaluation/Territory.java