Master - Added a new SQLite database to store Alarms
Master - Fixed merging conflicts