Last
Merge branch 'master' of https://github.com/blin4444/pcrs

Conflicts:
	Receptionist/XmlOptionsParser.h