Git commit
Merged files from office PC
Merge branch 'master' of git://github.com/StanDoherty/infodesign

Conflicts:
	infodesign_corporateinfo.dita
	mapgen_infodesign.ditamap
	mapgen_keydefs_corporate.ditamap