added jersey test
added jersey test
minor cleanup
adding tests around rest service
adding tests around rest service
modified since rest
added some todos and cleaned out a few dao functions
work on integration testing rest - server comes up, but jersey client doesn't retain security tokens
Merge remote-tracking branch 'origin/master'