changed pharmacy layout
Added basic Pharmacy layout
save encounters
missing commits from last commit
Modified pharmacy layout and added 10.sql
added pharmacies controller
fixed issues from pull
Merge branch 'feature-triage' of git://github.com/kevinzurek/femr into pharmacy-layout
medical view
merging with kevins fork
auto populate medical page
Merge pull request #37 from DPalombo/pharmacy-layout

populating medical page