Updating new concepts
Fixed an issue when directly getting a token in single  sign on controllers - Triggered by ANC  --> BART connection
updated the way mastercard is pulling some HIV staging conditions
Added API for ART summary prescription and dispensation
Merge branch 'master' of github.com:BaobabHealthTrust/bart2
Skipping authentication of art_summary_dispensation method
Modifying the way of rendering the drug summary
Updated the query to remove the limit keyword
Removing the division by 60
added a method to display 'Defaulter' outcome on matsercard
Merge branch 'master' of github.com:BaobabHealthTrust/bart2
Rescue if there is no city village
Rescue if person address locations are missing
Created a new interface for merging patients
Working on merging patients
Working on CSS for the merging page
Working on merging patients
search bug - 60% done
fixed month conversion
Merge branch 'master' of github.com:BaobabHealthTrust/bart2