Better parsing, tests for raid and server added
Merge branch 'master' of ssh://github.com/dmitryhd/NMS

Conflicts:
	collector/collector.py