Merging tasks into parent classes.
Merge branch 'master' of https://github.com/AA-Software/farm-adventure

Conflicts:

	farm_adventure/src/com/aa_software/farm_adventure/presenter/PlantTask.java