Work in progress
Fixed missing annotation on Descriptor Service
Merge pull request #96 from dejan-brkic/descriptorcontroller

Fixed missing annotation on Descriptor Service
Merge remote-tracking branch 'upstream/master'
Exceptions refactoring