Card #48 Added annotation for rest controller
Merge remote-tracking branch 'origin/develop' into develop