Alarms History added
Merge branch 'cindydev' which contains Alarm History View