Implemented robot damage
Port to Java 7
Revert "Implemented robot damage"

This reverts commit 2d277544ad0be884e20ba9104552a4261349a9e7.

This should not be on master...
MASON 18 is now stable and distributed as a jar
corrected proportions of evop probabilities
Add separate methods for fitness with and without time bonus
Added the fatJar task; this packages a jar with all dependencies included
Merge branch 'master' into hetero_comp
Merge branch 'master' into java7

Conflicts:
	src/main/java/za/redbridge/simulator/FitnessStats.java
Specify source version in build script
Merge branch 'java7' into hetero_comp

Conflicts:
	src/main/java/za/redbridge/simulator/Simulation.java
	src/main/java/za/redbridge/simulator/config/SimConfig.java