Merge pull request #744 from LightAdept/master

Flaaffy and Tentacruel (with cool animation)
Random structures now generate in the world.  They don't scan the ground to check if their bounding box will fit inside it yet and need some work done on placement as a result
Merge remote-tracking branch 'remotes/origin/master'
Re-arranged attack code
added basic and multi turn attacks to the effect map
Fix to confusion.  Added immobilise code, made repeated a part of it's code
added evadjusting items the macho brace and 5 power items
Fixes for the Health Bars and Battle System
Fixed Health Bars, small battle system fix
Merge pull request #750 from NearEDGE/master

Battle System and Health Bars
Update Attack.java

got rid of frivolous comments
Update GuiBattle.java

getting rid of frivolous comments
getting there with the upgrade to 1.5
Merge branch 'master' of https://github.com/MrMasochism/Pixelmon
heaps more fixes for 1.5 mostly sorting out item and block registration/textures/sprites
Fixed block rendering in inventory
Made nickname now display for all messages
begun moving the gui to the new texture binding system
fixed up battle, overlay and inventory gui
Armaldo Added
Merge remote-tracking branch 'origin/master'