Fixes to kafala & foundation
Merge branch 'master' of https://github.com/AbdoNile/Foundation