updated to current
Stuff
Merge branch 'master' of https://github.com/zorakirby/Pixelmon

Conflicts:
	minecraft/mcpmod.info
	minecraft/pixelmon/AI/AITargetEnvironment.java
	minecraft/pixelmon/Pixelmon.java
	minecraft/pixelmon/battles/attacks/specialAttacks/basic/Endeavor.java
	minecraft/pixelmon/blocks/BlockLeafEvolutionOre.java
	minecraft/pixelmon/client/ClientProxy.java
	minecraft/pixelmon/client/ModelOBJWrapper.java
	minecraft/pixelmon/client/models/ModelOBJWrapper.java
	minecraft/pixelmon/client/models/pokemon/ModelAron.java
	minecraft/pixelmon/client/models/pokemon/ModelBayleef.java
	minecraft/pixelmon/client/models/pokemon/ModelBlastoise.java
	minecraft/pixelmon/client/models/pokemon/ModelButterfree.java
	minecraft/pixelmon/client/models/pokemon/ModelCharizard.java
	minecraft/pixelmon/client/models/pokemon/ModelCharmander.java
	minecraft/pixelmon/client/models/pokemon/ModelCharmeleon.java
	minecraft/pixelmon/client/models/pokemon/ModelChikorita.java
	minecraft/pixelmon/client/models/pokemon/ModelChinchou.java
	minecraft/pixelmon/client/models/pokemon/ModelCyndaquil.java
	minecraft/pixelmon/client/models/pokemon/ModelDrifblim.java
	minecraft/pixelmon/client/models/pokemon/ModelDrifloon.java
	minecraft/pixelmon/client/models/pokemon/ModelElectrode.java
	minecraft/pixelmon/client/models/pokemon/ModelElekid.java
	minecraft/pixelmon/client/models/pokemon/ModelFeraligatr.java
	minecraft/pixelmon/client/models/pokemon/ModelFlygon.java
	minecraft/pixelmon/client/models/pokemon/ModelGastly.java
	minecraft/pixelmon/client/models/pokemon/ModelGirafarig.java
	minecraft/pixelmon/client/models/pokemon/ModelGrotle.java
	minecraft/pixelmon/client/models/pokemon/ModelGrovyle.java
	minecraft/pixelmon/client/models/pokemon/ModelHaunter.java
	minecraft/pixelmon/client/models/pokemon/ModelLanturn.java
	minecraft/pixelmon/client/models/pokemon/ModelMagikarp.java
	minecraft/pixelmon/client/models/pokemon/ModelMeganium.java
	minecraft/pixelmon/client/models/pokemon/ModelOddish.java
	minecraft/pixelmon/client/models/pokemon/ModelPidgey.java
	minecraft/pixelmon/client/models/pokemon/ModelPikachu.java
	minecraft/pixelmon/client/models/pokemon/ModelPoliwrath.java
	minecraft/pixelmon/client/models/pokemon/ModelPorygon.java
	minecraft/pixelmon/client/models/pokemon/ModelPsyduck.java
	minecraft/pixelmon/client/models/pokemon/ModelQuilava.java
	minecraft/pixelmon/client/models/pokemon/ModelRaichu.java
	minecraft/pixelmon/client/models/pokemon/ModelRayquaza.java
	minecraft/pixelmon/client/models/pokemon/ModelSceptile.java
	minecraft/pixelmon/client/models/pokemon/ModelSquirtle.java
	minecraft/pixelmon/client/models/pokemon/ModelTorterra.java
	minecraft/pixelmon/client/models/pokemon/ModelTreecko.java
	minecraft/pixelmon/client/models/pokemon/ModelTurtwig.java
	minecraft/pixelmon/client/models/pokemon/ModelTyphlosion.java
	minecraft/pixelmon/client/models/pokemon/ModelWartortle.java
	minecraft/pixelmon/client/models/pokemon/ModelWynaut.java
	minecraft/pixelmon/client/models/pokemon/flying/ModelCharizard.java
	minecraft/pixelmon/client/models/pokemon/flying/ModelFlygon.java
	minecraft/pixelmon/client/models/pokemon/flying/ModelPidgey.java
	minecraft/pixelmon/client/render/tileEntities/RenderTileEntityEvolutionRock.java
	minecraft/pixelmon/config/PixelmonConfig.java
	minecraft/pixelmon/config/PixelmonItems.java
	minecraft/pixelmon/spawning/spawners/SpawnerAir.java