Merge origin/master

Conflicts:
	src/com/paladion/jkp/IntrfcReqest.java