stable (theoretically); over-zealous validation
Merge branch 'master' of https://github.com/blin4444/pcrs

Conflicts:
	server_side/client_information_form.xml
	server_side/query.py