updated instructions for setting up
Merge branch 'development' of https://github.com/kevinzurek/femr into development
Added javascript file for tabing in encounter view as well as updated encounter
Added the modified templet files for encounter and its models file which know includs properties
from the medical model file
updated ehcounter page view
Added the Pharmacy Tab.  Created a CSS layout for the encounter page to include pharmacy.
tryied to combine medical and pharmacy together in encounter
Updated the search controller to populate the medical date
Updated the encounter page to show the medical date in readonly fields
created a ouput file to display the list of prescriptions or problems
No Changes where made from the last commit but the system
said these files needed to be commited
Fixed the issue where pharmacy infor shows up under the other tabs in the javascript file.  Added the pharmacy service to search controller to populate the date for the medication.  updated pharmacy tab display (still working on that)
Fixed the display issue with dynamic list
Refactored so that the encounter class is 1 to 1 and not storing medical in side of it.  created an incounter helper thats a duplicate of medical helper. refactered the encounter page so it uses only one model.
refactered more of the code from the search controller into the Encounter helper class.  added properties to indicate is the pharmacist changed the medication
Merge pull request #244 from b6025/development

Renamed 39.SQL to 39.sql. Uppercase suffix prevents Play evolutions from...
Infant age now displays in months in medical and pharmacy
Merge pull request #247 from Cohen-Carlisle/featureAge2

Infant age now displays in months in medical and pharmacy
Merge branch 'development' of https://github.com/kevinzurek/femr into development
move logic from update sex into controller
rename find patient prescription in pharmacy service
changed parameter name for findPatientPrescription
Merge pull request #248 from kevinzurek/testDrivenRefactoring

Cleaning up some business layer methods