home
Merge remote-tracking branch 'origin/master'

Conflicts:
	XML-Generator/XML-Generator.v12.suo