Merge branch 'create_cases' into master_and_create_cases

Conflicts:
	com_irontec_zsugar.properties