Merge branch 'master' of https://github.com/Temujin2887/mlib

Conflicts:
	core/callbacks.py
	core/qt.py