Project: usergrid
Issue USERGRID-680: Merge master -> two-dot-o: SSO & Assets changes
Story points: 1