Merge branch 'log' into atalarm
Merge branch 'atalarm' of https://github.com/mce35/agocontrol into atalarm
Merge remote-tracking branch 'github/develop' into atalarm

Conflicts:
	shared/agolog.cpp
	shared/agolog.h
[atalarm] switch to new log system
Merge remote-tracking branch 'github/atalarm'