fixing
Merge branch 'master' of https://github.com/oomlout/oomlout-OOMP into HEAD

Conflicts:
	tmp/tempCombinedXML.xml