Test
Merge branch 'master' of https://github.com/Multec/Multec_IM_13_7

Conflicts:
	Settings.txt