Updated Planter class
Merge of master branches...
Merge remote-tracking branch 'origin/master'

Conflicts:
	Swarm/src/com/fska/swarm/entity/unit/Planter.java
Merging take two..
Final Merge