working on authorization alerts
merged conflicts
harmonising controllers and views following changes
Merge branch 'master' of https://github.com/BaobabHealthTrust/ePICS