Module loading revisited. Modules can now be removed from the system.
Merge branch 'HEAD' of https://github.com/wpatrik14/ICTDroidLab.git

Conflicts:
	core/res/values/strings.xml