merge corrections

found a few unmatched changes between gerrit master and local dev master

Change-Id: I13341b17fb772c2f6250c99eca63e6f991544428
Merge branch 'master' of github.com:dan-nl/GWToolset

Conflicts:
	.gitignore

Change-Id: I6aee5c24cba4390e7dc8cbbecab257da33053b9b