wip fixing ui
Merge branch 'master' of github.com:bgirard/ToJAM2013
key state fix + ui