WIP tag duplicate
Merge branch 'master' of https://github.com/AXS-Studio/cmc002

Conflicts:
	mht/php/QIDSlog.txt