Project: usergrid
Issue USERGRID-598: Merge two-dot-o-dev into two-dot-o
Story points: 3