AI
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/nl/astraeus/angels/model/Planet.java
	src/nl/astraeus/angels/test/AI.java