Numerous bug fixes
Merge branch 'master' of https://github.com/iteloo/the_island