event view, alarms update
Merge branch 'master' of https://github.com/arunkab/DemoPhase1