from desktop
Merge branch 'master' of https://github.com/kehkok/kDummyLib

Conflicts:
	testing