refactored to single class REST server + Param and Data annotations
Merge remote-tracking branch 'origin/master'