release1.0.5
Merge remote-tracking branch 'origin/develop' into version1.0.5

Conflicts:
	README.md
	TestRel2/AppXML.xml