Fixed bug.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/nomeautomation/utility/datagen/DataGenerator.java