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

Conflicts:
	core/uml/class_overview.ucls
Merge branch 'master' of https://github.com/wpatrik14/ICTDroidLab