little changes in battle to make it work. (It's not working on develop, damn!)
Buttons are finally in good folder :|
changed ButtonState to ControlState
added collision cheking function
commit.
Merge branch 'feature/UI' into develop