Add AlarmStatusProvider, display node status in map
fix conflicts
Merge branch 'master' of ssh://opennms.git.sourceforge.net/gitroot/opennms/opennms