Merge branch 'master' of https://github.com/SCS-CBU-CED-IAM/allin-cmd

Conflicts:
	itext/allin_itext.cfg
change .cfg file because of removing keystore function