added new features to application
Merge branch 'master' of https://github.com/BaobabHealthTrust/ePICS
added item  borrowing feature
resolved conflicts