[atalarm] cleanup
Merge remote-tracking branch 'github/develop' into atalarm

Conflicts:
	devices/CMakeLists.txt
[atalarm] Fix set/get option
Merge remote-tracking branch 'github/atalarm'