ability to serve up registration options in xml
Merge branch 'master' of github.com:blin4444/pcrs

Conflicts:
	server_side/server.py
adding the client information form
Merge branch 'master' of github.com:blin4444/pcrs
Resolving conflicts in server.py