User profile with change password option and overflow bug fix
Contact us page with mailer and datepicker for selecting date of birth
fixed date of birth issue in patients registration form
Added autofill in contact us
Added jqplot, tasks to create dummy data and cancan authorization
refactored code for rake task
indentation fixed in rake task
Testing.rake refactored
resolved conflicts
Single chart for p24h and v24h, generated visit time and registration time for a normal patient entry and some bug fixes
history single view
datetimepicker-slider view need to be corrected
discharge summary-History(without styling)
Discharge summary-Investigation(without styling)
Discharge summary-prescription and follow up(without styling)
Discharge summary-Admission(without styling)
added #TODO for a future task
Merge branch 'alex2' of https://bitbucket.org/akhilsikri/emr into alex2
Generated pdf for History
Discharge summary PDF