Update 2.1

From Mac
Merge branch 'master' of https://github.com/RebarDesign/DItestBlind

Conflicts:
	config.xml