Merge branch 'frank' of http://192.168.100.242:3000/PRSDigital/prs into frank

# Conflicts:
#	prs.desktop/prsdesktop.iss
#	prs.server/PRSServer.iss