Module loading update
Merge branch 'master' of https://github.com/wpatrik14/ICTDroidLab.git