Market Screen & upgrade info fixed
Merge branch 'master' into LeslyTestAgain

Conflicts:
	farm_adventure/src/com/aa_software/farm_adventure/model/Market.java

farm_adventure/src/com/aa_software/farm_adventure/presenter/screen/farm_
screen/AbstractFarmScreen.java
update
Tutorial and inventory bugs fixed
Merge branch 'LeslyTestAgain'
market & tutorial label color