Plot can now be irrigated, carrots can be planted and harvested

Plot can now be irrigated, carrots can be planted and harvested
Merge branch 'LeslyBranch' of https://github.com/AA-Software/farm-adventure into LeslyBranch

Conflicts:

farm_adventure/src/com/aa_software/farm_adventure/model/selectable/item/
crop/CarrotCrop.java

farm_adventure/src/com/aa_software/farm_adventure/model/selectable/item/
tool/harvest/ScytheTool.java

farm_adventure/src/com/aa_software/farm_adventure/model/selectable/item/
tool/irrigate/ShovelTool.java

farm_adventure/src/com/aa_software/farm_adventure/model/selectable/item/
tool/plant/TrowelTool.java

farm_adventure/src/com/aa_software/farm_adventure/model/selectable/item/
tool/plow/HandPlowTool.java

farm_adventure/src/com/aa_software/farm_adventure/model/selectable/plot/
Irrigation.java

farm_adventure/src/com/aa_software/farm_adventure/model/selectable/plot/
Plot.java

farm_adventure/src/com/aa_software/farm_adventure/presenter/screen/farm_
screen/AbstractFarmScreen.java