test
Merge pull request #1 from micjagga/slave

Slave
Merge pull request #2 from micjagga/slave

Slave
Merge pull request #3 from micjagga/slave

Record Form and Health Plan display
worked on registration gui
Merge branch 'master' into slave
changed system names