Cleaned Code + Vulnerability Alpha

- repositioned icons
- cleaned code
- implemented vulnerable colorstate on hpbar (not working and no idea
why)
Tabs to Spaces
maybe\?
Merge branch 'development' into merging
Updating to ryu's code manually
Merge pull request #16 from vikinghug/merging

Merging Ryuichiro's changes manually
Merge pull request #21 from vikinghug/development

Merging development, Master was destroyed with the previous merge conflict...