delete blank spaces in ScaffoldUnit.properties
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/test/resources/ScaffoldUnit.properties