Updated submodules
Removed Natify from Simba, It's in Lape now.
Merge branch 'master' of github.com:MerlijnWajer/Simba
Merge Conflict Fix