t
Merge branch 'master' of https://github.com/wjkcow/VIMC

Conflicts:
	VIMC/VIMC_ConfigData.h