fixed links in login pages
fixed conflicts
Merge branch 'master' of https://github.com/BaobabHealthTrust/ePICS
made changes to migrations and added exchange items feature