Merge remote-tracking branch 'origin/master'

Conflicts:
	common/ibkicraft/IbkiCraft.java