Minor fixes
Merge branch 'master' of https://github.com/Dandi91/master

Conflicts:
	MDK_Project/master.uvoptx