fix some errors
Merge branch 'master' of https://github.com/r0gger/Popcorn-Baker

Conflicts:
	PT-DEV.bat