many fixes
Merge branch 'master' of https://github.com/Nyyman/Global-Game-Jame-2014