Merge origin/master

Conflicts:
	src/BLL/BLLAlarm.java
Merge origin/master
Merge origin/master

Conflicts:
	src/BLL/BLLAlarm.java
Merge origin/master