1.4
Merge branch 'integration' of https://github.com/siren0413/DataGenerator into integration

Conflicts:
	UML.mgc