Modules change
Merge branch 'master' of https://github.com/wpatrik14/ICTDroidLab.git

Conflicts:
	core/assets/jars/SampleModule.jar