Implement DescoveryItem
Merge branch 'development' of github.com:Vagrants/blackbird into development