Merge from AudreyBranch
Lesly's branche merges to master branch

Lesly's branche merges to master branch
Merging in status bar and tutorial changes.
Changes that didn't get merged.
Small refactor and bug fix for plot irrigation.
Bug fix. Watch paths, please.
Tried to add market text to tutorial.
This should be ready to go for the video.
Merge branch 'master' into LeslySandoval

Conflicts:
	farm_adventure-android/.classpath
	farm_adventure-android/assets/textures/bananaCrop.png
	farm_adventure-android/assets/textures/beetCrop.png
	farm_adventure-android/assets/textures/carrotCrop.png
	farm_adventure-android/assets/textures/riceCrop.png
	farm_adventure-android/assets/tilemap/tileMap128.tmx
	farm_adventure-android/assets/tilemap/tileSet128.png
	farm_adventure-desktop/.classpath
	farm_adventure-desktop/.project
	farm_adventure/src/com/aa_software/farm_adventure/model/Field.java
	farm_adventure/src/com/aa_software/farm_adventure/model/Inventory.java
	farm_adventure/src/com/aa_software/farm_adventure/model/Market.java
	farm_adventure/src/com/aa_software/farm_adventure/model/Player.java
	farm_adventure/src/com/aa_software/farm_adventure/model/ToolBar.java

farm_adventure/src/com/aa_software/farm_adventure/model/farm/AbstractFar
m.java

farm_adventure/src/com/aa_software/farm_adventure/model/farm/DesertFarm.
java

farm_adventure/src/com/aa_software/farm_adventure/model/farm/RainforestF
arm.java

farm_adventure/src/com/aa_software/farm_adventure/model/farm/SnowFarm.ja
va

farm_adventure/src/com/aa_software/farm_adventure/model/farm/TutorialFar
m.java

farm_adventure/src/com/aa_software/farm_adventure/model/item/AbstractIte
m.java

farm_adventure/src/com/aa_software/farm_adventure/model/item/crop/Abstra
ctCrop.java

farm_adventure/src/com/aa_software/farm_adventure/model/item/crop/Banana
Crop.java

farm_adventure/src/com/aa_software/farm_adventure/model/item/crop/BeetCr
op.java

farm_adventure/src/com/aa_software/farm_adventure/model/item/crop/Carrot
Crop.java

farm_adventure/src/com/aa_software/farm_adventure/model/item/crop/RiceCr
op.java

farm_adventure/src/com/aa_software/farm_adventure/model/item/spell/Abstr
actSpell.java

farm_adventure/src/com/aa_software/farm_adventure/model/item/spell/Illus
ionistSpell.java

farm_adventure/src/com/aa_software/farm_adventure/model/item/spell/Locus
tSwarmSpell.java

farm_adventure/src/com/aa_software/farm_adventure/model/item/spell/Moles
Spell.java

farm_adventure/src/com/aa_software/farm_adventure/model/item/spell/RainC
allSpell.java

farm_adventure/src/com/aa_software/farm_adventure/model/item/spell/TimeF
reezeSpell.java

farm_adventure/src/com/aa_software/farm_adventure/model/item/tool/Abstra
ctTool.java

farm_adventure/src/com/aa_software/farm_adventure/model/item/tool/harves
t/AbstractHarvestTool.java

farm_adventure/src/com/aa_software/farm_adventure/model/item/tool/harves
t/CombineTool.java

farm_adventure/src/com/aa_software/farm_adventure/model/item/tool/harves
t/ScytheTool.java

farm_adventure/src/com/aa_software/farm_adventure/model/item/tool/irriga
te/AbstractIrrigationTool.java

farm_adventure/src/com/aa_software/farm_adventure/model/item/tool/irriga
te/BackhoeTool.java

farm_adventure/src/com/aa_software/farm_adventure/model/item/tool/irriga
te/ShovelTool.java

farm_adventure/src/com/aa_software/farm_adventure/model/item/tool/plant/
AbstractPlantTool.java

farm_adventure/src/com/aa_software/farm_adventure/model/item/tool/plant/
SeederTool.java

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

farm_adventure/src/com/aa_software/farm_adventure/model/item/tool/plow/A
bstractPlowTool.java

farm_adventure/src/com/aa_software/farm_adventure/model/item/tool/plow/H
andPlowTool.java

farm_adventure/src/com/aa_software/farm_adventure/model/item/tool/plow/M
uleTool.java

farm_adventure/src/com/aa_software/farm_adventure/model/item/upgrade/Abs
tractUpgrade.java

farm_adventure/src/com/aa_software/farm_adventure/model/item/upgrade/Bri
beryUpgrade.java

farm_adventure/src/com/aa_software/farm_adventure/model/item/upgrade/Cop
perToolsUpgrade.java

farm_adventure/src/com/aa_software/farm_adventure/model/item/upgrade/Lob
byingUpgrade.java

farm_adventure/src/com/aa_software/farm_adventure/model/item/upgrade/Ste
elToolsUpgrade.java

farm_adventure/src/com/aa_software/farm_adventure/model/item/upgrade/Wat
erPumpUpgrade.java

farm_adventure/src/com/aa_software/farm_adventure/model/item/upgrade/Win
dmillUpgrade.java

farm_adventure/src/com/aa_software/farm_adventure/model/item/worker/Abst
ractWorker.java

farm_adventure/src/com/aa_software/farm_adventure/model/item/worker/Defa
ultWorker.java
	farm_adventure/src/com/aa_software/farm_adventure/model/plot/Plot.java

farm_adventure/src/com/aa_software/farm_adventure/presenter/IrrigationTa
sk.java

farm_adventure/src/com/aa_software/farm_adventure/presenter/screen/Abstr
actScreen.java

farm_adventure/src/com/aa_software/farm_adventure/presenter/screen/World
Screen.java

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

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

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

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

farm_adventure/src/com/aa_software/farm_adventure/presenter/state/Defaul
tSelectionState.java

farm_adventure/src/com/aa_software/farm_adventure/presenter/state/ISelec
tionState.java

farm_adventure/src/com/aa_software/farm_adventure/presenter/state/SpellS
electionState.java

farm_adventure/src/com/aa_software/farm_adventure/presenter/state/ToolSe
lectionState.java

farm_adventure/src/com/aa_software/farm_adventure/presenter/state/Upgrad
eSelectionState.java