Merge origin/master

Conflicts:
	src/BE/BEAlarm.java
Merge origin/master