changes in roxly's machine
commit dec. 12
Merge branch 'master' of github.com:NTMRonBe/ntm_extension

Conflicts:
	iat_transfer.py
	ntm_menu2.xml