fixed unit move 11
Merge origin/master

Conflicts:
	src/Controls/Ai.java
Merge origin/master
Merge origin/master
Merge origin/master
Merge origin/master
Merge origin/master

Conflicts:
	src/Controls/Ai.java
Merge origin/master

Conflicts:
	src/Controls/Ai.java