Converted encounter form to new security model
Merge branch 'master' of git://github.com/openemr/openemr