Changes in module loading, still have bugs
Merge branch 'master' of https://github.com/wpatrik14/ICTDroidLab.git