Merge branch 'master' of github.com:oleg3000/FarmerGame

Conflicts:
	obj/FarmerGameConfig.old
	src/Main.as
	src/ok/models/FieldModel.as
	src/ok/models/Model.as
	src/ok/models/Plant.as
	src/ok/models/interfaces/IFieldModel.as
	src/ok/models/interfaces/IModel.as
	src/ok/models/interfaces/IPlant.as
	src/ok/models/plants/CloverModel.as
	src/ok/models/plants/PotatoModel.as
	src/ok/models/plants/SunflowerModel.as
	src/ok/proxys/XMLFieldModelProxy.as
	src/ok/proxys/XMLModelProxy.as
	src/ok/proxys/XMLPlantProxy.as

Resolved