davids changes
Merge branch 'feature-triage' of git://github.com/kevinzurek/femr into pharmacy-layout