Fixing annotation compile error.
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into binary_serialization

# By Dave Johnson
# Via Dave Johnson
* 'two-dot-o' of https://github.com/usergrid/usergrid:
  Fixing annotation compile error.