Merge branch 'master' of https://github.com/dgleba/dgnote144b

Conflicts:
	.mtimes
changed