Add AlarmStatusProvider, display node status in map
fix conflicts
Worked on Object Model, added interface dao
bump version in preparation for beta
Merge branch 'master' of ssh://opennms.git.sourceforge.net/gitroot/opennms/opennms
Moved capsd integration test to its own package

All Linkd test run successfull
Merge branch 'master' into features/linkd-scalability