small changes
Merge branch 'master' of https://github.com/juppie7780/terminal-password-manager

Conflicts:
	build/built-jar.properties
	dist/TPM.jar
changed windows.jar