[01/60] [abbrv] incubator-usergrid git commit: cherry picking docs from master

[sn...@apache.org]

Repository: incubator-usergrid
Updated Branches:
  refs/heads/two-dot-o-dev 9f81d7bcb -> e5979feb1


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/website/tmp/compiled_content
----------------------------------------------------------------------
diff --git a/website/tmp/compiled_content b/website/tmp/compiled_content
new file mode 100644
index 0000000..ebac80e
--- /dev/null
+++ b/website/tmp/compiled_content
@@ -0,0 +1,91671 @@
+{:	data{
�I"/bootstrap/bootstrap/:ET{:default{:	lastI"��
/*!
+ * Bootstrap v3.0.0
+ *
+ * Copyright 2013 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world by @mdo and @fat.
+ *//*! normalize.css v2.1.0 | MIT License | git.io/normalize */article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,video{display:inline-block}audio:not([controls]){display:none;height:0}[hidden]{display:none}html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}a:focus{outline:thin dotted}a:active,a:hover{outline:0}h1{margin:.67em 0;font-size:2em}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}dfn{font-style:italic}hr{height:0;-moz-box-sizing:content-box;box-sizing:content-box}mark{color:#000;background:#ff0}code,kbd,pre,samp{font-family:monospace,serif;font-size:1em}pre{white-space:pre-wrap}q{quotes:"\201C" "\201D" "\2018" "\2019"}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:0}fieldset{padding:.35em .625em .75em;margin:0 
 2px;border:1px solid #c0c0c0}legend{padding:0;border:0}button,input,select,textarea{margin:0;font-family:inherit;font-size:100%}button,input{line-height:normal}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button}button[disabled],html input[disabled]{cursor:default}input[type="checkbox"],input[type="radio"]{padding:0;box-sizing:border-box}input[type="search"]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}textarea{overflow:auto;vertical-align:top}table{border-collapse:collapse;border-spacing:0}@media print{*{color:#000!important;text-shadow:none!important;background:transparent!important;box-shadow:none!important}a,a:visited{text-decorati
 on:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}.ir a:after,a[href^="javascript:"]:after,a[href^="#"]:after{content:""}pre,blockquote{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}tr,img{page-break-inside:avoid}img{max-width:100%!important}@page{margin:2cm .5cm}p,h2,h3{orphans:3;widows:3}h2,h3{page-break-after:avoid}.navbar{display:none}.table td,.table th{background-color:#fff!important}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000!important}.label{border:1px solid #000}.table{border-collapse:collapse!important}.table-bordered th,.table-bordered td{border:1px solid #ddd!important}}*,*:before,*:after{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:62.5%;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.428571429;color:#333;background-color:#fff}input,button,select
 ,textarea{font-family:inherit;font-size:inherit;line-height:inherit}button,input,select[multiple],textarea{background-image:none}a{color:#428bca;text-decoration:none}a:hover,a:focus{color:#2a6496;text-decoration:underline}a:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}img{vertical-align:middle}.img-responsive{display:block;height:auto;max-width:100%}.img-rounded{border-radius:6px}.img-thumbnail{display:inline-block;height:auto;max-width:100%;padding:4px;line-height:1.428571429;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.img-circle{border-radius:50%}hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #eee}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0 0 0 0);border:0}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:16.099999999999998px;font-weight:200;line-height:1.4}@media(min-w
 idth:768px){.lead{font-size:21px}}small{font-size:85%}cite{font-style:normal}.text-muted{color:#999}.text-primary{color:#428bca}.text-warning{color:#c09853}.text-danger{color:#b94a48}.text-success{color:#468847}.text-info{color:#3a87ad}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}h1,h2,h3,h4,h5,h6,.h1,.h2,.h3,.h4,.h5,.h6{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-weight:500;line-height:1.1}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small,.h1 small,.h2 small,.h3 small,.h4 small,.h5 small,.h6 small{font-weight:normal;line-height:1;color:#999}h1,h2,h3{margin-top:20px;margin-bottom:10px}h1 small,h2 small,h3 small{font-size:65%}h4,h5,h6{margin-top:10px;margin-bottom:10px}h4 small,h5 small,h6 small{font-size:75%}h1,.h1{font-size:36px}h2,.h2{font-size:30px}h3,.h3{font-size:24px}h4,.h4{font-size:18px}h5,.h5{font-size:14px}h6,.h6{font-size:12px}.page-header{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #eee}ul,o
 l{margin-top:0;margin-bottom:10px}ul ul,ol ul,ul ol,ol ol{margin-bottom:0}.list-unstyled{padding-left:0;list-style:none}.list-inline{padding-left:0;list-style:none}.list-inline>li{display:inline-block;padding-right:5px;padding-left:5px}dl{margin-bottom:20px}dt,dd{line-height:1.428571429}dt{font-weight:bold}dd{margin-left:0}@media(min-width:768px){.dl-horizontal dt{float:left;width:160px;overflow:hidden;clear:left;text-align:right;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}.dl-horizontal dd:before,.dl-horizontal dd:after{display:table;content:" "}.dl-horizontal dd:after{clear:both}.dl-horizontal dd:before,.dl-horizontal dd:after{display:table;content:" "}.dl-horizontal dd:after{clear:both}}abbr[title],abbr[data-original-title]{cursor:help;border-bottom:1px dotted #999}abbr.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:10px 20px;margin:0 0 20px;border-left:5px solid #eee}blockquote p{font-size:17.5px;font-weight:300;line-height
 :1.25}blockquote p:last-child{margin-bottom:0}blockquote small{display:block;line-height:1.428571429;color:#999}blockquote small:before{content:'\2014 \00A0'}blockquote.pull-right{padding-right:15px;padding-left:0;border-right:5px solid #eee;border-left:0}blockquote.pull-right p,blockquote.pull-right small{text-align:right}blockquote.pull-right small:before{content:''}blockquote.pull-right small:after{content:'\00A0 \2014'}q:before,q:after,blockquote:before,blockquote:after{content:""}address{display:block;margin-bottom:20px;font-style:normal;line-height:1.428571429}code,pre{font-family:Monaco,Menlo,Consolas,"Courier New",monospace}code{padding:2px 4px;font-size:90%;color:#c7254e;white-space:nowrap;background-color:#f9f2f4;border-radius:4px}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.428571429;color:#333;word-break:break-all;word-wrap:break-word;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}pre.prettyprint{margin-bottom:20px}pre co
 de{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border:0}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}.container:before,.container:after{display:table;content:" "}.container:after{clear:both}.container:before,.container:after{display:table;content:" "}.container:after{clear:both}.row{margin-right:-15px;margin-left:-15px}.row:before,.row:after{display:table;content:" "}.row:after{clear:both}.row:before,.row:after{display:table;content:" "}.row:after{clear:both}.col-xs-1,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9,.col-xs-10,.col-xs-11,.col-xs-12,.col-sm-1,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-sm-10,.col-sm-11,.col-sm-12,.col-md-1,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-md-10,.col-md-11,.col-md-12,.col-lg-1,.col-lg-2,.col-lg-
 3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-lg-10,.col-lg-11,.col-lg-12{position:relative;min-height:1px;padding-right:15px;padding-left:15px}.col-xs-1,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9,.col-xs-10,.col-xs-11{float:left}.col-xs-1{width:8.333333333333332%}.col-xs-2{width:16.666666666666664%}.col-xs-3{width:25%}.col-xs-4{width:33.33333333333333%}.col-xs-5{width:41.66666666666667%}.col-xs-6{width:50%}.col-xs-7{width:58.333333333333336%}.col-xs-8{width:66.66666666666666%}.col-xs-9{width:75%}.col-xs-10{width:83.33333333333334%}.col-xs-11{width:91.66666666666666%}.col-xs-12{width:100%}@media(min-width:768px){.container{max-width:750px}.col-sm-1,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-sm-10,.col-sm-11{float:left}.col-sm-1{width:8.333333333333332%}.col-sm-2{width:16.666666666666664%}.col-sm-3{width:25%}.col-sm-4{width:33.33333333333333%}.col-sm-5{width:41.66666666666667%}.col-sm-
 6{width:50%}.col-sm-7{width:58.333333333333336%}.col-sm-8{width:66.66666666666666%}.col-sm-9{width:75%}.col-sm-10{width:83.33333333333334%}.col-sm-11{width:91.66666666666666%}.col-sm-12{width:100%}.col-sm-push-1{left:8.333333333333332%}.col-sm-push-2{left:16.666666666666664%}.col-sm-push-3{left:25%}.col-sm-push-4{left:33.33333333333333%}.col-sm-push-5{left:41.66666666666667%}.col-sm-push-6{left:50%}.col-sm-push-7{left:58.333333333333336%}.col-sm-push-8{left:66.66666666666666%}.col-sm-push-9{left:75%}.col-sm-push-10{left:83.33333333333334%}.col-sm-push-11{left:91.66666666666666%}.col-sm-pull-1{right:8.333333333333332%}.col-sm-pull-2{right:16.666666666666664%}.col-sm-pull-3{right:25%}.col-sm-pull-4{right:33.33333333333333%}.col-sm-pull-5{right:41.66666666666667%}.col-sm-pull-6{right:50%}.col-sm-pull-7{right:58.333333333333336%}.col-sm-pull-8{right:66.66666666666666%}.col-sm-pull-9{right:75%}.col-sm-pull-10{right:83.33333333333334%}.col-sm-pull-11{right:91.66666666666666%}.col-sm-offse
 t-1{margin-left:8.333333333333332%}.col-sm-offset-2{margin-left:16.666666666666664%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-4{margin-left:33.33333333333333%}.col-sm-offset-5{margin-left:41.66666666666667%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-7{margin-left:58.333333333333336%}.col-sm-offset-8{margin-left:66.66666666666666%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-10{margin-left:83.33333333333334%}.col-sm-offset-11{margin-left:91.66666666666666%}}@media(min-width:992px){.container{max-width:970px}.col-md-1,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-md-10,.col-md-11{float:left}.col-md-1{width:8.333333333333332%}.col-md-2{width:16.666666666666664%}.col-md-3{width:25%}.col-md-4{width:33.33333333333333%}.col-md-5{width:41.66666666666667%}.col-md-6{width:50%}.col-md-7{width:58.333333333333336%}.col-md-8{width:66.66666666666666%}.col-md-9{width:75%}.col-md-10{width:83.33333333333334%}.col-md-11{width:91.66666666666666%}.col
 -md-12{width:100%}.col-md-push-0{left:auto}.col-md-push-1{left:8.333333333333332%}.col-md-push-2{left:16.666666666666664%}.col-md-push-3{left:25%}.col-md-push-4{left:33.33333333333333%}.col-md-push-5{left:41.66666666666667%}.col-md-push-6{left:50%}.col-md-push-7{left:58.333333333333336%}.col-md-push-8{left:66.66666666666666%}.col-md-push-9{left:75%}.col-md-push-10{left:83.33333333333334%}.col-md-push-11{left:91.66666666666666%}.col-md-pull-0{right:auto}.col-md-pull-1{right:8.333333333333332%}.col-md-pull-2{right:16.666666666666664%}.col-md-pull-3{right:25%}.col-md-pull-4{right:33.33333333333333%}.col-md-pull-5{right:41.66666666666667%}.col-md-pull-6{right:50%}.col-md-pull-7{right:58.333333333333336%}.col-md-pull-8{right:66.66666666666666%}.col-md-pull-9{right:75%}.col-md-pull-10{right:83.33333333333334%}.col-md-pull-11{right:91.66666666666666%}.col-md-offset-0{margin-left:0}.col-md-offset-1{margin-left:8.333333333333332%}.col-md-offset-2{margin-left:16.666666666666664%}.col-md-offse
 t-3{margin-left:25%}.col-md-offset-4{margin-left:33.33333333333333%}.col-md-offset-5{margin-left:41.66666666666667%}.col-md-offset-6{margin-left:50%}.col-md-offset-7{margin-left:58.333333333333336%}.col-md-offset-8{margin-left:66.66666666666666%}.col-md-offset-9{margin-left:75%}.col-md-offset-10{margin-left:83.33333333333334%}.col-md-offset-11{margin-left:91.66666666666666%}}@media(min-width:1200px){.container{max-width:1170px}.col-lg-1,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-lg-10,.col-lg-11{float:left}.col-lg-1{width:8.333333333333332%}.col-lg-2{width:16.666666666666664%}.col-lg-3{width:25%}.col-lg-4{width:33.33333333333333%}.col-lg-5{width:41.66666666666667%}.col-lg-6{width:50%}.col-lg-7{width:58.333333333333336%}.col-lg-8{width:66.66666666666666%}.col-lg-9{width:75%}.col-lg-10{width:83.33333333333334%}.col-lg-11{width:91.66666666666666%}.col-lg-12{width:100%}.col-lg-push-0{left:auto}.col-lg-push-1{left:8.333333333333332%}.col-lg-push-
 2{left:16.666666666666664%}.col-lg-push-3{left:25%}.col-lg-push-4{left:33.33333333333333%}.col-lg-push-5{left:41.66666666666667%}.col-lg-push-6{left:50%}.col-lg-push-7{left:58.333333333333336%}.col-lg-push-8{left:66.66666666666666%}.col-lg-push-9{left:75%}.col-lg-push-10{left:83.33333333333334%}.col-lg-push-11{left:91.66666666666666%}.col-lg-pull-0{right:auto}.col-lg-pull-1{right:8.333333333333332%}.col-lg-pull-2{right:16.666666666666664%}.col-lg-pull-3{right:25%}.col-lg-pull-4{right:33.33333333333333%}.col-lg-pull-5{right:41.66666666666667%}.col-lg-pull-6{right:50%}.col-lg-pull-7{right:58.333333333333336%}.col-lg-pull-8{right:66.66666666666666%}.col-lg-pull-9{right:75%}.col-lg-pull-10{right:83.33333333333334%}.col-lg-pull-11{right:91.66666666666666%}.col-lg-offset-0{margin-left:0}.col-lg-offset-1{margin-left:8.333333333333332%}.col-lg-offset-2{margin-left:16.666666666666664%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-4{margin-left:33.33333333333333%}.col-lg-offset-5{margin-lef
 t:41.66666666666667%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-7{margin-left:58.333333333333336%}.col-lg-offset-8{margin-left:66.66666666666666%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-10{margin-left:83.33333333333334%}.col-lg-offset-11{margin-left:91.66666666666666%}}table{max-width:100%;background-color:transparent}th{text-align:left}.table{width:100%;margin-bottom:20px}.table thead>tr>th,.table tbody>tr>th,.table tfoot>tr>th,.table thead>tr>td,.table tbody>tr>td,.table tfoot>tr>td{padding:8px;line-height:1.428571429;vertical-align:top;border-top:1px solid #ddd}.table thead>tr>th{vertical-align:bottom;border-bottom:2px solid #ddd}.table caption+thead tr:first-child th,.table colgroup+thead tr:first-child th,.table thead:first-child tr:first-child th,.table caption+thead tr:first-child td,.table colgroup+thead tr:first-child td,.table thead:first-child tr:first-child td{border-top:0}.table tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.tabl
 e-condensed thead>tr>th,.table-condensed tbody>tr>th,.table-condensed tfoot>tr>th,.table-condensed thead>tr>td,.table-condensed tbody>tr>td,.table-condensed tfoot>tr>td{padding:5px}.table-bordered{border:1px solid #ddd}.table-bordered>thead>tr>th,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>tbody>tr>td,.table-bordered>tfoot>tr>td{border:1px solid #ddd}.table-bordered>thead>tr>th,.table-bordered>thead>tr>td{border-bottom-width:2px}.table-striped>tbody>tr:nth-child(odd)>td,.table-striped>tbody>tr:nth-child(odd)>th{background-color:#f9f9f9}.table-hover>tbody>tr:hover>td,.table-hover>tbody>tr:hover>th{background-color:#f5f5f5}table col[class*="col-"]{display:table-column;float:none}table td[class*="col-"],table th[class*="col-"]{display:table-cell;float:none}.table>thead>tr>td.active,.table>tbody>tr>td.active,.table>tfoot>tr>td.active,.table>thead>tr>th.active,.table>tbody>tr>th.active,.table>tfoot>tr>th.active,.table>thead>tr.activ
 e>td,.table>tbody>tr.active>td,.table>tfoot>tr.active>td,.table>thead>tr.active>th,.table>tbody>tr.active>th,.table>tfoot>tr.active>th{background-color:#f5f5f5}.table>thead>tr>td.success,.table>tbody>tr>td.success,.table>tfoot>tr>td.success,.table>thead>tr>th.success,.table>tbody>tr>th.success,.table>tfoot>tr>th.success,.table>thead>tr.success>td,.table>tbody>tr.success>td,.table>tfoot>tr.success>td,.table>thead>tr.success>th,.table>tbody>tr.success>th,.table>tfoot>tr.success>th{background-color:#dff0d8;border-color:#d6e9c6}.table-hover>tbody>tr>td.success:hover,.table-hover>tbody>tr>th.success:hover,.table-hover>tbody>tr.success:hover>td,.table-hover>tbody>tr.success:hover>th{background-color:#d0e9c6;border-color:#c9e2b3}.table>thead>tr>td.danger,.table>tbody>tr>td.danger,.table>tfoot>tr>td.danger,.table>thead>tr>th.danger,.table>tbody>tr>th.danger,.table>tfoot>tr>th.danger,.table>thead>tr.danger>td,.table>tbody>tr.danger>td,.table>tfoot>tr.danger>td,.table>thead>tr.danger>th,.tabl
 e>tbody>tr.danger>th,.table>tfoot>tr.danger>th{background-color:#f2dede;border-color:#eed3d7}.table-hover>tbody>tr>td.danger:hover,.table-hover>tbody>tr>th.danger:hover,.table-hover>tbody>tr.danger:hover>td,.table-hover>tbody>tr.danger:hover>th{background-color:#ebcccc;border-color:#e6c1c7}.table>thead>tr>td.warning,.table>tbody>tr>td.warning,.table>tfoot>tr>td.warning,.table>thead>tr>th.warning,.table>tbody>tr>th.warning,.table>tfoot>tr>th.warning,.table>thead>tr.warning>td,.table>tbody>tr.warning>td,.table>tfoot>tr.warning>td,.table>thead>tr.warning>th,.table>tbody>tr.warning>th,.table>tfoot>tr.warning>th{background-color:#fcf8e3;border-color:#fbeed5}.table-hover>tbody>tr>td.warning:hover,.table-hover>tbody>tr>th.warning:hover,.table-hover>tbody>tr.warning:hover>td,.table-hover>tbody>tr.warning:hover>th{background-color:#faf2cc;border-color:#f8e5be}@media(max-width:768px){.table-responsive{width:100%;margin-bottom:15px;overflow-x:scroll;overflow-y:hidden;border:1px solid #ddd;-ms-
 overflow-style:-ms-autohiding-scrollbar;-webkit-overflow-scrolling:touch}.table-responsive>.table{margin-bottom:0;background-color:#fff}.table-responsive>.table>thead>tr>th,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tfoot>tr>td{white-space:nowrap}.table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered>thead>tr>th:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child{border-left:0}.table-responsive>.table-bordered>thead>tr>th:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>t
 d:last-child,.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child{border-right:0}.table-responsive>.table-bordered>thead>tr:last-child>th,.table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>th,.table-responsive>.table-bordered>thead>tr:last-child>td,.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>td{border-bottom:0}}fieldset{padding:0;margin:0;border:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:inherit;color:#333;border:0;border-bottom:1px solid #e5e5e5}label{display:inline-block;margin-bottom:5px;font-weight:bold}input[type="search"]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type="radio"],input[type="checkbox"]{margin:4px 0 0;margin-top:1px \9;line-height:normal}input[type="file"]{display:block}select[multiple],sele
 ct[size]{height:auto}select optgroup{font-family:inherit;font-size:inherit;font-style:inherit}input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}input[type="number"]::-webkit-outer-spin-button,input[type="number"]::-webkit-inner-spin-button{height:auto}output{display:block;padding-top:7px;font-size:14px;line-height:1.428571429;color:#555;vertical-align:middle}.form-control:-moz-placeholder{color:#999}.form-control::-moz-placeholder{color:#999}.form-control:-ms-input-placeholder{color:#999}.form-control::-webkit-input-placeholder{color:#999}.form-control{display:block;width:100%;height:34px;padding:6px 12px;font-size:14px;line-height:1.428571429;color:#555;vertical-align:middle;background-color:#fff;border:1px solid #ccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-webkit-transition:border-color eas
 e-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s}.form-control:focus{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(102,175,233,0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(102,175,233,0.6)}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{cursor:not-allowed;background-color:#eee}textarea.form-control{height:auto}.form-group{margin-bottom:15px}.radio,.checkbox{display:block;min-height:20px;padding-left:20px;margin-top:10px;margin-bottom:10px;vertical-align:middle}.radio label,.checkbox label{display:inline;margin-bottom:0;font-weight:normal;cursor:pointer}.radio input[type="radio"],.radio-inline input[type="radio"],.checkbox input[type="checkbox"],.checkbox-inline input[type="checkbox"]{float:left;margin-left:-20px}.radio+.radio,.checkbox+.checkbox{margin-top:-5px}.radio-inline,.checkbox-inline{display:inline-block;padding-l
 eft:20px;margin-bottom:0;font-weight:normal;vertical-align:middle;cursor:pointer}.radio-inline+.radio-inline,.checkbox-inline+.checkbox-inline{margin-top:0;margin-left:10px}input[type="radio"][disabled],input[type="checkbox"][disabled],.radio[disabled],.radio-inline[disabled],.checkbox[disabled],.checkbox-inline[disabled],fieldset[disabled] input[type="radio"],fieldset[disabled] input[type="checkbox"],fieldset[disabled] .radio,fieldset[disabled] .radio-inline,fieldset[disabled] .checkbox,fieldset[disabled] .checkbox-inline{cursor:not-allowed}.input-sm{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-sm{height:30px;line-height:30px}textarea.input-sm{height:auto}.input-lg{height:45px;padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}select.input-lg{height:45px;line-height:45px}textarea.input-lg{height:auto}.has-warning .help-block,.has-warning .control-label{color:#c09853}.has-warning .form-control{border-color:#c09853;-webki
 t-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.has-warning .form-control:focus{border-color:#a47e3c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #dbc59e;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #dbc59e}.has-warning .input-group-addon{color:#c09853;background-color:#fcf8e3;border-color:#c09853}.has-error .help-block,.has-error .control-label{color:#b94a48}.has-error .form-control{border-color:#b94a48;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.has-error .form-control:focus{border-color:#953b39;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #d59392;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #d59392}.has-error .input-group-addon{color:#b94a48;background-color:#f2dede;border-color:#b94a48}.has-success .help-block,.has-success .control-label{color:#468847}.has-success .form-control{border-color:#468847;-webkit-box-shadow:inset 0 1px 1px 
 rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.has-success .form-control:focus{border-color:#356635;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7aba7b;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7aba7b}.has-success .input-group-addon{color:#468847;background-color:#dff0d8;border-color:#468847}.form-control-static{padding-top:7px;margin-bottom:0}.help-block{display:block;margin-top:5px;margin-bottom:10px;color:#737373}@media(min-width:768px){.form-inline .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.form-inline .form-control{display:inline-block}.form-inline .radio,.form-inline .checkbox{display:inline-block;padding-left:0;margin-top:0;margin-bottom:0}.form-inline .radio input[type="radio"],.form-inline .checkbox input[type="checkbox"]{float:none;margin-left:0}}.form-horizontal .control-label,.form-horizontal .radio,.form-horizontal .checkbox,.form-horizontal .radio-inline,.form-horizontal .checkbox-inline{padding
 -top:7px;margin-top:0;margin-bottom:0}.form-horizontal .form-group{margin-right:-15px;margin-left:-15px}.form-horizontal .form-group:before,.form-horizontal .form-group:after{display:table;content:" "}.form-horizontal .form-group:after{clear:both}.form-horizontal .form-group:before,.form-horizontal .form-group:after{display:table;content:" "}.form-horizontal .form-group:after{clear:both}@media(min-width:768px){.form-horizontal .control-label{text-align:right}}.btn{display:inline-block;padding:6px 12px;margin-bottom:0;font-size:14px;font-weight:normal;line-height:1.428571429;text-align:center;white-space:nowrap;vertical-align:middle;cursor:pointer;border:1px solid transparent;border-radius:4px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;-o-user-select:none;user-select:none}.btn:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn:hover,.btn:focus{color:#333;text-decoration:none}.btn:active,.btn.active{background-ima
 ge:none;outline:0;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{pointer-events:none;cursor:not-allowed;opacity:.65;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none}.btn-default{color:#333;background-color:#fff;border-color:#ccc}.btn-default:hover,.btn-default:focus,.btn-default:active,.btn-default.active,.open .dropdown-toggle.btn-default{color:#333;background-color:#ebebeb;border-color:#adadad}.btn-default:active,.btn-default.active,.open .dropdown-toggle.btn-default{background-image:none}.btn-default.disabled,.btn-default[disabled],fieldset[disabled] .btn-default,.btn-default.disabled:hover,.btn-default[disabled]:hover,fieldset[disabled] .btn-default:hover,.btn-default.disabled:focus,.btn-default[disabled]:focus,fieldset[disabled] .btn-default:focus,.btn-default.disabled:active,.btn-default[disabled]:active,fieldset[disabled] .btn-default:active,.btn-default.dis
 abled.active,.btn-default[disabled].active,fieldset[disabled] .btn-default.active{background-color:#fff;border-color:#ccc}.btn-primary{color:#fff;background-color:#428bca;border-color:#357ebd}.btn-primary:hover,.btn-primary:focus,.btn-primary:active,.btn-primary.active,.open .dropdown-toggle.btn-primary{color:#fff;background-color:#3276b1;border-color:#285e8e}.btn-primary:active,.btn-primary.active,.open .dropdown-toggle.btn-primary{background-image:none}.btn-primary.disabled,.btn-primary[disabled],fieldset[disabled] .btn-primary,.btn-primary.disabled:hover,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary:hover,.btn-primary.disabled:focus,.btn-primary[disabled]:focus,fieldset[disabled] .btn-primary:focus,.btn-primary.disabled:active,.btn-primary[disabled]:active,fieldset[disabled] .btn-primary:active,.btn-primary.disabled.active,.btn-primary[disabled].active,fieldset[disabled] .btn-primary.active{background-color:#428bca;border-color:#357ebd}.btn-warning{color:#fff;backg
 round-color:#f0ad4e;border-color:#eea236}.btn-warning:hover,.btn-warning:focus,.btn-warning:active,.btn-warning.active,.open .dropdown-toggle.btn-warning{color:#fff;background-color:#ed9c28;border-color:#d58512}.btn-warning:active,.btn-warning.active,.open .dropdown-toggle.btn-warning{background-image:none}.btn-warning.disabled,.btn-warning[disabled],fieldset[disabled] .btn-warning,.btn-warning.disabled:hover,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning:hover,.btn-warning.disabled:focus,.btn-warning[disabled]:focus,fieldset[disabled] .btn-warning:focus,.btn-warning.disabled:active,.btn-warning[disabled]:active,fieldset[disabled] .btn-warning:active,.btn-warning.disabled.active,.btn-warning[disabled].active,fieldset[disabled] .btn-warning.active{background-color:#f0ad4e;border-color:#eea236}.btn-danger{color:#fff;background-color:#d9534f;border-color:#d43f3a}.btn-danger:hover,.btn-danger:focus,.btn-danger:active,.btn-danger.active,.open .dropdown-toggle.btn-danger{col
 or:#fff;background-color:#d2322d;border-color:#ac2925}.btn-danger:active,.btn-danger.active,.open .dropdown-toggle.btn-danger{background-image:none}.btn-danger.disabled,.btn-danger[disabled],fieldset[disabled] .btn-danger,.btn-danger.disabled:hover,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger:hover,.btn-danger.disabled:focus,.btn-danger[disabled]:focus,fieldset[disabled] .btn-danger:focus,.btn-danger.disabled:active,.btn-danger[disabled]:active,fieldset[disabled] .btn-danger:active,.btn-danger.disabled.active,.btn-danger[disabled].active,fieldset[disabled] .btn-danger.active{background-color:#d9534f;border-color:#d43f3a}.btn-success{color:#fff;background-color:#5cb85c;border-color:#4cae4c}.btn-success:hover,.btn-success:focus,.btn-success:active,.btn-success.active,.open .dropdown-toggle.btn-success{color:#fff;background-color:#47a447;border-color:#398439}.btn-success:active,.btn-success.active,.open .dropdown-toggle.btn-success{background-image:none}.btn-success.disab
 led,.btn-success[disabled],fieldset[disabled] .btn-success,.btn-success.disabled:hover,.btn-success[disabled]:hover,fieldset[disabled] .btn-success:hover,.btn-success.disabled:focus,.btn-success[disabled]:focus,fieldset[disabled] .btn-success:focus,.btn-success.disabled:active,.btn-success[disabled]:active,fieldset[disabled] .btn-success:active,.btn-success.disabled.active,.btn-success[disabled].active,fieldset[disabled] .btn-success.active{background-color:#5cb85c;border-color:#4cae4c}.btn-info{color:#fff;background-color:#5bc0de;border-color:#46b8da}.btn-info:hover,.btn-info:focus,.btn-info:active,.btn-info.active,.open .dropdown-toggle.btn-info{color:#fff;background-color:#39b3d7;border-color:#269abc}.btn-info:active,.btn-info.active,.open .dropdown-toggle.btn-info{background-image:none}.btn-info.disabled,.btn-info[disabled],fieldset[disabled] .btn-info,.btn-info.disabled:hover,.btn-info[disabled]:hover,fieldset[disabled] .btn-info:hover,.btn-info.disabled:focus,.btn-info[disable
 d]:focus,fieldset[disabled] .btn-info:focus,.btn-info.disabled:active,.btn-info[disabled]:active,fieldset[disabled] .btn-info:active,.btn-info.disabled.active,.btn-info[disabled].active,fieldset[disabled] .btn-info.active{background-color:#5bc0de;border-color:#46b8da}.btn-link{font-weight:normal;color:#428bca;cursor:pointer;border-radius:0}.btn-link,.btn-link:active,.btn-link[disabled],fieldset[disabled] .btn-link{background-color:transparent;-webkit-box-shadow:none;box-shadow:none}.btn-link,.btn-link:hover,.btn-link:focus,.btn-link:active{border-color:transparent}.btn-link:hover,.btn-link:focus{color:#2a6496;text-decoration:underline;background-color:transparent}.btn-link[disabled]:hover,fieldset[disabled] .btn-link:hover,.btn-link[disabled]:focus,fieldset[disabled] .btn-link:focus{color:#999;text-decoration:none}.btn-lg{padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}.btn-sm,.btn-xs{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-xs{paddi
 ng:1px 5px}.btn-block{display:block;width:100%;padding-right:0;padding-left:0}.btn-block+.btn-block{margin-top:5px}input[type="submit"].btn-block,input[type="reset"].btn-block,input[type="button"].btn-block{width:100%}.fade{opacity:0;-webkit-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{display:none}.collapse.in{display:block}.collapsing{position:relative;height:0;overflow:hidden;-webkit-transition:height .35s ease;transition:height .35s ease}@font-face{font-family:'Glyphicons Halflings';src:url('../fonts/glyphicons-halflings-regular.eot');src:url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'),url('../fonts/glyphicons-halflings-regular.woff') format('woff'),url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'),url('../fonts/glyphicons-halflings-regular.svg#glyphicons-halflingsregular') format('svg')}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';-
 webkit-font-smoothing:antialiased;font-style:normal;font-weight:normal;line-height:1}.glyphicon:empty{width:1em}.glyphicon-asterisk:before{content:"\2a"}.glyphicon-plus:before{content:"\2b"}.glyphicon-euro:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e0
 16"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:before{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeat:before{content:"\e030"}.glyphicon-refresh:before{content:"\e031"}.glyphicon-list-alt:before{content:"\e032"}.glyphicon-flag:before{content:"\e034"}.glyphicon-headphones:before{content:"\e035"}.glyphicon-volume-off:before{content:"\e036"}.glyphicon-volume-down:before{content:"\e037"}.glyphicon-volume-up:before{content:"\e038"}.glyphicon-qrcode:before{content:"\e039"}.glyphicon-barcode:before{content:"\e040"}.glyphicon-tag:before{content:"\e04
 1"}.glyphicon-tags:before{content:"\e042"}.glyphicon-book:before{content:"\e043"}.glyphicon-print:before{content:"\e045"}.glyphicon-font:before{content:"\e047"}.glyphicon-bold:before{content:"\e048"}.glyphicon-italic:before{content:"\e049"}.glyphicon-text-height:before{content:"\e050"}.glyphicon-text-width:before{content:"\e051"}.glyphicon-align-left:before{content:"\e052"}.glyphicon-align-center:before{content:"\e053"}.glyphicon-align-right:before{content:"\e054"}.glyphicon-align-justify:before{content:"\e055"}.glyphicon-list:before{content:"\e056"}.glyphicon-indent-left:before{content:"\e057"}.glyphicon-indent-right:before{content:"\e058"}.glyphicon-facetime-video:before{content:"\e059"}.glyphicon-picture:before{content:"\e060"}.glyphicon-map-marker:before{content:"\e062"}.glyphicon-adjust:before{content:"\e063"}.glyphicon-tint:before{content:"\e064"}.glyphicon-edit:before{content:"\e065"}.glyphicon-share:before{content:"\e066"}.glyphicon-check:before{content:"\e067"}.glyphicon-mo
 ve:before{content:"\e068"}.glyphicon-step-backward:before{content:"\e069"}.glyphicon-fast-backward:before{content:"\e070"}.glyphicon-backward:before{content:"\e071"}.glyphicon-play:before{content:"\e072"}.glyphicon-pause:before{content:"\e073"}.glyphicon-stop:before{content:"\e074"}.glyphicon-forward:before{content:"\e075"}.glyphicon-fast-forward:before{content:"\e076"}.glyphicon-step-forward:before{content:"\e077"}.glyphicon-eject:before{content:"\e078"}.glyphicon-chevron-left:before{content:"\e079"}.glyphicon-chevron-right:before{content:"\e080"}.glyphicon-plus-sign:before{content:"\e081"}.glyphicon-minus-sign:before{content:"\e082"}.glyphicon-remove-sign:before{content:"\e083"}.glyphicon-ok-sign:before{content:"\e084"}.glyphicon-question-sign:before{content:"\e085"}.glyphicon-info-sign:before{content:"\e086"}.glyphicon-screenshot:before{content:"\e087"}.glyphicon-remove-circle:before{content:"\e088"}.glyphicon-ok-circle:before{content:"\e089"}.glyphicon-ban-circle:before{content:
 "\e090"}.glyphicon-arrow-left:before{content:"\e091"}.glyphicon-arrow-right:before{content:"\e092"}.glyphicon-arrow-up:before{content:"\e093"}.glyphicon-arrow-down:before{content:"\e094"}.glyphicon-share-alt:before{content:"\e095"}.glyphicon-resize-full:before{content:"\e096"}.glyphicon-resize-small:before{content:"\e097"}.glyphicon-exclamation-sign:before{content:"\e101"}.glyphicon-gift:before{content:"\e102"}.glyphicon-leaf:before{content:"\e103"}.glyphicon-eye-open:before{content:"\e105"}.glyphicon-eye-close:before{content:"\e106"}.glyphicon-warning-sign:before{content:"\e107"}.glyphicon-plane:before{content:"\e108"}.glyphicon-random:before{content:"\e110"}.glyphicon-comment:before{content:"\e111"}.glyphicon-magnet:before{content:"\e112"}.glyphicon-chevron-up:before{content:"\e113"}.glyphicon-chevron-down:before{content:"\e114"}.glyphicon-retweet:before{content:"\e115"}.glyphicon-shopping-cart:before{content:"\e116"}.glyphicon-folder-close:before{content:"\e117"}.glyphicon-folder
 -open:before{content:"\e118"}.glyphicon-resize-vertical:before{content:"\e119"}.glyphicon-resize-horizontal:before{content:"\e120"}.glyphicon-hdd:before{content:"\e121"}.glyphicon-bullhorn:before{content:"\e122"}.glyphicon-certificate:before{content:"\e124"}.glyphicon-thumbs-up:before{content:"\e125"}.glyphicon-thumbs-down:before{content:"\e126"}.glyphicon-hand-right:before{content:"\e127"}.glyphicon-hand-left:before{content:"\e128"}.glyphicon-hand-up:before{content:"\e129"}.glyphicon-hand-down:before{content:"\e130"}.glyphicon-circle-arrow-right:before{content:"\e131"}.glyphicon-circle-arrow-left:before{content:"\e132"}.glyphicon-circle-arrow-up:before{content:"\e133"}.glyphicon-circle-arrow-down:before{content:"\e134"}.glyphicon-globe:before{content:"\e135"}.glyphicon-tasks:before{content:"\e137"}.glyphicon-filter:before{content:"\e138"}.glyphicon-fullscreen:before{content:"\e140"}.glyphicon-dashboard:before{content:"\e141"}.glyphicon-heart-empty:before{content:"\e143"}.glyphicon-
 link:before{content:"\e144"}.glyphicon-phone:before{content:"\e145"}.glyphicon-usd:before{content:"\e148"}.glyphicon-gbp:before{content:"\e149"}.glyphicon-sort:before{content:"\e150"}.glyphicon-sort-by-alphabet:before{content:"\e151"}.glyphicon-sort-by-alphabet-alt:before{content:"\e152"}.glyphicon-sort-by-order:before{content:"\e153"}.glyphicon-sort-by-order-alt:before{content:"\e154"}.glyphicon-sort-by-attributes:before{content:"\e155"}.glyphicon-sort-by-attributes-alt:before{content:"\e156"}.glyphicon-unchecked:before{content:"\e157"}.glyphicon-expand:before{content:"\e158"}.glyphicon-collapse-down:before{content:"\e159"}.glyphicon-collapse-up:before{content:"\e160"}.glyphicon-log-in:before{content:"\e161"}.glyphicon-flash:before{content:"\e162"}.glyphicon-log-out:before{content:"\e163"}.glyphicon-new-window:before{content:"\e164"}.glyphicon-record:before{content:"\e165"}.glyphicon-save:before{content:"\e166"}.glyphicon-open:before{content:"\e167"}.glyphicon-saved:before{content:
 "\e168"}.glyphicon-import:before{content:"\e169"}.glyphicon-export:before{content:"\e170"}.glyphicon-send:before{content:"\e171"}.glyphicon-floppy-disk:before{content:"\e172"}.glyphicon-floppy-saved:before{content:"\e173"}.glyphicon-floppy-remove:before{content:"\e174"}.glyphicon-floppy-save:before{content:"\e175"}.glyphicon-floppy-open:before{content:"\e176"}.glyphicon-credit-card:before{content:"\e177"}.glyphicon-transfer:before{content:"\e178"}.glyphicon-cutlery:before{content:"\e179"}.glyphicon-header:before{content:"\e180"}.glyphicon-compressed:before{content:"\e181"}.glyphicon-earphone:before{content:"\e182"}.glyphicon-phone-alt:before{content:"\e183"}.glyphicon-tower:before{content:"\e184"}.glyphicon-stats:before{content:"\e185"}.glyphicon-sd-video:before{content:"\e186"}.glyphicon-hd-video:before{content:"\e187"}.glyphicon-subtitles:before{content:"\e188"}.glyphicon-sound-stereo:before{content:"\e189"}.glyphicon-sound-dolby:before{content:"\e190"}.glyphicon-sound-5-1:before{
 content:"\e191"}.glyphicon-sound-6-1:before{content:"\e192"}.glyphicon-sound-7-1:before{content:"\e193"}.glyphicon-copyright-mark:before{content:"\e194"}.glyphicon-registration-mark:before{content:"\e195"}.glyphicon-cloud-download:before{content:"\e197"}.glyphicon-cloud-upload:before{content:"\e198"}.glyphicon-tree-conifer:before{content:"\e199"}.glyphicon-tree-deciduous:before{content:"\e200"}.glyphicon-briefcase:before{content:"\1f4bc"}.glyphicon-calendar:before{content:"\1f4c5"}.glyphicon-pushpin:before{content:"\1f4cc"}.glyphicon-paperclip:before{content:"\1f4ce"}.glyphicon-camera:before{content:"\1f4f7"}.glyphicon-lock:before{content:"\1f512"}.glyphicon-bell:before{content:"\1f514"}.glyphicon-bookmark:before{content:"\1f516"}.glyphicon-fire:before{content:"\1f525"}.glyphicon-wrench:before{content:"\1f527"}.caret{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px solid #000;border-right:4px solid transparent;border-bottom:0 dotted;border-l
 eft:4px solid transparent;content:""}.dropdown{position:relative}.dropdown-toggle:focus{outline:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;font-size:14px;list-style:none;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,0.175);box-shadow:0 6px 12px rgba(0,0,0,0.175);background-clip:padding-box}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:normal;line-height:1.428571429;color:#333;white-space:nowrap}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus{color:#fff;text-decoration:none;background-color:#428bca}.dropdown-menu>.active>a,.dropdown-menu>.active>a:hover,.dropdown-menu>.active>a:focus{color:#fff;text-decoration:none;background-color:#428bca;outl
 ine:0}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{color:#999}.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{text-decoration:none;cursor:not-allowed;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.open>.dropdown-menu{display:block}.open>a{outline:0}.dropdown-header{display:block;padding:3px 20px;font-size:12px;line-height:1.428571429;color:#999}.dropdown-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:990}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{border-top:0 dotted;border-bottom:4px solid #000;content:""}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:1px}@media(min-width:768px){.navbar-right .dropdown-menu{right:0;left:auto}}.btn-default .caret{border-top-color:#333}.btn-primary .caret,.btn-success .caret,.btn-warning .care
 t,.btn-danger .caret,.btn-info .caret{border-top-color:#fff}.dropup .btn-default .caret{border-bottom-color:#333}.dropup .btn-primary .caret,.dropup .btn-success .caret,.dropup .btn-warning .caret,.dropup .btn-danger .caret,.dropup .btn-info .caret{border-bottom-color:#fff}.btn-group,.btn-group-vertical{position:relative;display:inline-block;vertical-align:middle}.btn-group>.btn,.btn-group-vertical>.btn{position:relative;float:left}.btn-group>.btn:hover,.btn-group-vertical>.btn:hover,.btn-group>.btn:focus,.btn-group-vertical>.btn:focus,.btn-group>.btn:active,.btn-group-vertical>.btn:active,.btn-group>.btn.active,.btn-group-vertical>.btn.active{z-index:2}.btn-group>.btn:focus,.btn-group-vertical>.btn:focus{outline:0}.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group{margin-left:-1px}.btn-toolbar:before,.btn-toolbar:after{display:table;content:" "}.btn-toolbar:after{clear:both}.btn-toolbar:before,.btn-toolbar:after{display:table
 ;content:" "}.btn-toolbar:after{clear:both}.btn-toolbar .btn-group{float:left}.btn-toolbar>.btn+.btn,.btn-toolbar>.btn-group+.btn,.btn-toolbar>.btn+.btn-group,.btn-toolbar>.btn-group+.btn-group{margin-left:5px}.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){border-radius:0}.btn-group>.btn:first-child{margin-left:0}.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn:last-child:not(:first-child),.btn-group>.dropdown-toggle:not(:first-child){border-bottom-left-radius:0;border-top-left-radius:0}.btn-group>.btn-group{float:left}.btn-group>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group>.btn-group:first-child>.btn:last-child,.btn-group>.btn-group:first-child>.dropdown-toggle{border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn-group:last-child>.btn:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.btn-group .dropdown
 -toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group-xs>.btn{padding:5px 10px;padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px}.btn-group-sm>.btn{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-group-lg>.btn{padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}.btn-group>.btn+.dropdown-toggle{padding-right:8px;padding-left:8px}.btn-group>.btn-lg+.dropdown-toggle{padding-right:12px;padding-left:12px}.btn-group.open .dropdown-toggle{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)}.btn .caret{margin-left:0}.btn-lg .caret{border-width:5px 5px 0;border-bottom-width:0}.dropup .btn-lg .caret{border-width:0 5px 5px}.btn-group-vertical>.btn,.btn-group-vertical>.btn-group{display:block;float:none;width:100%;max-width:100%}.btn-group-vertical>.btn-group:before,.btn-group-vertical>.btn-group:after{display:table;content:" "}.btn-group-vertical>.btn-group:after{clear:both}.btn-g
 roup-vertical>.btn-group:before,.btn-group-vertical>.btn-group:after{display:table;content:" "}.btn-group-vertical>.btn-group:after{clear:both}.btn-group-vertical>.btn-group>.btn{float:none}.btn-group-vertical>.btn+.btn,.btn-group-vertical>.btn+.btn-group,.btn-group-vertical>.btn-group+.btn,.btn-group-vertical>.btn-group+.btn-group{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn:not(:first-child):not(:last-child){border-radius:0}.btn-group-vertical>.btn:first-child:not(:last-child){border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn:last-child:not(:first-child){border-top-right-radius:0;border-bottom-left-radius:4px;border-top-left-radius:0}.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group-vertical>.btn-group:first-child>.btn:last-child,.btn-group-vertical>.btn-group:first-child>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>
 .btn-group:last-child>.btn:first-child{border-top-right-radius:0;border-top-left-radius:0}.btn-group-justified{display:table;width:100%;border-collapse:separate;table-layout:fixed}.btn-group-justified .btn{display:table-cell;float:none;width:1%}[data-toggle="buttons"]>.btn>input[type="radio"],[data-toggle="buttons"]>.btn>input[type="checkbox"]{display:none}.input-group{position:relative;display:table;border-collapse:separate}.input-group.col{float:none;padding-right:0;padding-left:0}.input-group .form-control{width:100%;margin-bottom:0}.input-group-lg>.form-control,.input-group-lg>.input-group-addon,.input-group-lg>.input-group-btn>.btn{height:45px;padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}select.input-group-lg>.form-control,select.input-group-lg>.input-group-addon,select.input-group-lg>.input-group-btn>.btn{height:45px;line-height:45px}textarea.input-group-lg>.form-control,textarea.input-group-lg>.input-group-addon,textarea.input-group-lg>.input-group-btn>
 .btn{height:auto}.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-group-sm>.form-control,select.input-group-sm>.input-group-addon,select.input-group-sm>.input-group-btn>.btn{height:30px;line-height:30px}textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon,textarea.input-group-sm>.input-group-btn>.btn{height:auto}.input-group-addon,.input-group-btn,.input-group .form-control{display:table-cell}.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child),.input-group .form-control:not(:first-child):not(:last-child){border-radius:0}.input-group-addon,.input-group-btn{width:1%;white-space:nowrap;vertical-align:middle}.input-group-addon{padding:6px 12px;font-size:14px;font-weight:normal;line-height:1;text-align:center;background-color:#eee;border:1px solid #ccc;border-radiu
 s:4px}.input-group-addon.input-sm{padding:5px 10px;font-size:12px;border-radius:3px}.input-group-addon.input-lg{padding:10px 16px;font-size:18px;border-radius:6px}.input-group-addon input[type="radio"],.input-group-addon input[type="checkbox"]{margin-top:0}.input-group .form-control:first-child,.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.input-group-addon:first-child{border-right:0}.input-group .form-control:last-child,.input-group-addon:last-child,.input-group-btn:last-child>.btn,.input-group-btn:last-child>.dropdown-toggle,.input-group-btn:first-child>.btn:not(:first-child){border-bottom-left-radius:0;border-top-left-radius:0}.input-group-addon:last-child{border-left:0}.input-group-btn{position:relative;white-space:nowrap}.input-group-btn>.btn{position:relative}.input-group-btn>.btn+.btn{m
 argin-left:-4px}.input-group-btn>.btn:hover,.input-group-btn>.btn:active{z-index:2}.nav{padding-left:0;margin-bottom:0;list-style:none}.nav:before,.nav:after{display:table;content:" "}.nav:after{clear:both}.nav:before,.nav:after{display:table;content:" "}.nav:after{clear:both}.nav>li{position:relative;display:block}.nav>li>a{position:relative;display:block;padding:10px 15px}.nav>li>a:hover,.nav>li>a:focus{text-decoration:none;background-color:#eee}.nav>li.disabled>a{color:#999}.nav>li.disabled>a:hover,.nav>li.disabled>a:focus{color:#999;text-decoration:none;cursor:not-allowed;background-color:transparent}.nav .open>a,.nav .open>a:hover,.nav .open>a:focus{background-color:#eee;border-color:#428bca}.nav .nav-divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.nav>li>a>img{max-width:none}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{float:left;margin-bottom:-1px}.nav-tabs>li>a{margin-right:2px;line-height:1.428571429;border:1px solid transparent;border-radiu
 s:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd}.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{color:#555;cursor:default;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent}.nav-tabs.nav-justified{width:100%;border-bottom:0}.nav-tabs.nav-justified>li{float:none}.nav-tabs.nav-justified>li>a{margin-bottom:5px;text-align:center}@media(min-width:768px){.nav-tabs.nav-justified>li{display:table-cell;width:1%}.nav-tabs.nav-justified>li>a{margin-bottom:0}}.nav-tabs.nav-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{border:1px solid #ddd}@media(min-width:768px){.nav-tabs.nav-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{border-bottom-color:#fff}}.nav-pills>li{float:left}.nav
 -pills>li>a{border-radius:5px}.nav-pills>li+li{margin-left:2px}.nav-pills>li.active>a,.nav-pills>li.active>a:hover,.nav-pills>li.active>a:focus{color:#fff;background-color:#428bca}.nav-stacked>li{float:none}.nav-stacked>li+li{margin-top:2px;margin-left:0}.nav-justified{width:100%}.nav-justified>li{float:none}.nav-justified>li>a{margin-bottom:5px;text-align:center}@media(min-width:768px){.nav-justified>li{display:table-cell;width:1%}.nav-justified>li>a{margin-bottom:0}}.nav-tabs-justified{border-bottom:0}.nav-tabs-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:hover,.nav-tabs-justified>.active>a:focus{border:1px solid #ddd}@media(min-width:768px){.nav-tabs-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:hover,.nav-tabs-justified>.active>a:focus{border-bottom-color:#fff}}.tabbable:before,.tabbable:after{display:table;content:" "}.tabbable:after
 {clear:both}.tabbable:before,.tabbable:after{display:table;content:" "}.tabbable:after{clear:both}.tab-content>.tab-pane,.pill-content>.pill-pane{display:none}.tab-content>.active,.pill-content>.active{display:block}.nav .caret{border-top-color:#428bca;border-bottom-color:#428bca}.nav a:hover .caret{border-top-color:#2a6496;border-bottom-color:#2a6496}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-right-radius:0;border-top-left-radius:0}.navbar{position:relative;z-index:1000;min-height:50px;margin-bottom:20px;border:1px solid transparent}.navbar:before,.navbar:after{display:table;content:" "}.navbar:after{clear:both}.navbar:before,.navbar:after{display:table;content:" "}.navbar:after{clear:both}@media(min-width:768px){.navbar{border-radius:4px}}.navbar-header:before,.navbar-header:after{display:table;content:" "}.navbar-header:after{clear:both}.navbar-header:before,.navbar-header:after{display:table;content:" "}.navbar-header:after{clear:both}@media(min-width:768px){.navbar-hea
 der{float:left}}.navbar-collapse{max-height:340px;padding-right:15px;padding-left:15px;overflow-x:visible;border-top:1px solid transparent;box-shadow:inset 0 1px 0 rgba(255,255,255,0.1);-webkit-overflow-scrolling:touch}.navbar-collapse:before,.navbar-collapse:after{display:table;content:" "}.navbar-collapse:after{clear:both}.navbar-collapse:before,.navbar-collapse:after{display:table;content:" "}.navbar-collapse:after{clear:both}.navbar-collapse.in{overflow-y:auto}@media(min-width:768px){.navbar-collapse{width:auto;border-top:0;box-shadow:none}.navbar-collapse.collapse{display:block!important;height:auto!important;padding-bottom:0;overflow:visible!important}.navbar-collapse.in{overflow-y:visible}.navbar-collapse .navbar-nav.navbar-left:first-child{margin-left:-15px}.navbar-collapse .navbar-nav.navbar-right:last-child{margin-right:-15px}.navbar-collapse .navbar-text:last-child{margin-right:0}}.container>.navbar-header,.container>.navbar-collapse{margin-right:-15px;margin-left:-15px}@
 media(min-width:768px){.container>.navbar-header,.container>.navbar-collapse{margin-right:0;margin-left:0}}.navbar-static-top{border-width:0 0 1px}@media(min-width:768px){.navbar-static-top{border-radius:0}}.navbar-fixed-top,.navbar-fixed-bottom{position:fixed;right:0;left:0;border-width:0 0 1px}@media(min-width:768px){.navbar-fixed-top,.navbar-fixed-bottom{border-radius:0}}.navbar-fixed-top{top:0;z-index:1030}.navbar-fixed-bottom{bottom:0;margin-bottom:0}.navbar-brand{float:left;padding:15px 15px;font-size:18px;line-height:20px}.navbar-brand:hover,.navbar-brand:focus{text-decoration:none}@media(min-width:768px){.navbar>.container .navbar-brand{margin-left:-15px}}.navbar-toggle{position:relative;float:right;padding:9px 10px;margin-top:8px;margin-right:15px;margin-bottom:8px;background-color:transparent;border:1px solid transparent;border-radius:4px}.navbar-toggle .icon-bar{display:block;width:22px;height:2px;border-radius:1px}.navbar-toggle .icon-bar+.icon-bar{margin-top:4px}@media(
 min-width:768px){.navbar-toggle{display:none}}.navbar-nav{margin:7.5px -15px}.navbar-nav>li>a{padding-top:10px;padding-bottom:10px;line-height:20px}@media(max-width:767px){.navbar-nav .open .dropdown-menu{position:static;float:none;width:auto;margin-top:0;background-color:transparent;border:0;box-shadow:none}.navbar-nav .open .dropdown-menu>li>a,.navbar-nav .open .dropdown-menu .dropdown-header{padding:5px 15px 5px 25px}.navbar-nav .open .dropdown-menu>li>a{line-height:20px}.navbar-nav .open .dropdown-menu>li>a:hover,.navbar-nav .open .dropdown-menu>li>a:focus{background-image:none}}@media(min-width:768px){.navbar-nav{float:left;margin:0}.navbar-nav>li{float:left}.navbar-nav>li>a{padding-top:15px;padding-bottom:15px}}@media(min-width:768px){.navbar-left{float:left!important}.navbar-right{float:right!important}}.navbar-form{padding:10px 15px;margin-top:8px;margin-right:-15px;margin-bottom:8px;margin-left:-15px;border-top:1px solid transparent;border-bottom:1px solid transparent;-webk
 it-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1);box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1)}@media(min-width:768px){.navbar-form .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.navbar-form .form-control{display:inline-block}.navbar-form .radio,.navbar-form .checkbox{display:inline-block;padding-left:0;margin-top:0;margin-bottom:0}.navbar-form .radio input[type="radio"],.navbar-form .checkbox input[type="checkbox"]{float:none;margin-left:0}}@media(max-width:767px){.navbar-form .form-group{margin-bottom:5px}}@media(min-width:768px){.navbar-form{width:auto;padding-top:0;padding-bottom:0;margin-right:0;margin-left:0;border:0;-webkit-box-shadow:none;box-shadow:none}}.navbar-nav>li>.dropdown-menu{margin-top:0;border-top-right-radius:0;border-top-left-radius:0}.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{border-bottom-right-radius:0;border-bottom-left-radius:0}.navbar-nav.pull-right>li>.dropdown-
 menu,.navbar-nav>li>.dropdown-menu.pull-right{right:0;left:auto}.navbar-btn{margin-top:8px;margin-bottom:8px}.navbar-text{float:left;margin-top:15px;margin-bottom:15px}@media(min-width:768px){.navbar-text{margin-right:15px;margin-left:15px}}.navbar-default{background-color:#f8f8f8;border-color:#e7e7e7}.navbar-default .navbar-brand{color:#777}.navbar-default .navbar-brand:hover,.navbar-default .navbar-brand:focus{color:#5e5e5e;background-color:transparent}.navbar-default .navbar-text{color:#777}.navbar-default .navbar-nav>li>a{color:#777}.navbar-default .navbar-nav>li>a:hover,.navbar-default .navbar-nav>li>a:focus{color:#333;background-color:transparent}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:hover,.navbar-default .navbar-nav>.active>a:focus{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav>.disabled>a,.navbar-default .navbar-nav>.disabled>a:hover,.navbar-default .navbar-nav>.disabled>a:focus{color:#ccc;background-color:transparent}.n
 avbar-default .navbar-toggle{border-color:#ddd}.navbar-default .navbar-toggle:hover,.navbar-default .navbar-toggle:focus{background-color:#ddd}.navbar-default .navbar-toggle .icon-bar{background-color:#ccc}.navbar-default .navbar-collapse,.navbar-default .navbar-form{border-color:#e6e6e6}.navbar-default .navbar-nav>.dropdown>a:hover .caret,.navbar-default .navbar-nav>.dropdown>a:focus .caret{border-top-color:#333;border-bottom-color:#333}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:hover,.navbar-default .navbar-nav>.open>a:focus{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav>.open>a .caret,.navbar-default .navbar-nav>.open>a:hover .caret,.navbar-default .navbar-nav>.open>a:focus .caret{border-top-color:#555;border-bottom-color:#555}.navbar-default .navbar-nav>.dropdown>a .caret{border-top-color:#777;border-bottom-color:#777}@media(max-width:767px){.navbar-default .navbar-nav .open .dropdown-menu>li>a{color:#777}.navbar-default .navbar-nav 
 .open .dropdown-menu>li>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>li>a:focus{color:#333;background-color:transparent}.navbar-default .navbar-nav .open .dropdown-menu>.active>a,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:focus{color:#ccc;background-color:transparent}}.navbar-default .navbar-link{color:#777}.navbar-default .navbar-link:hover{color:#333}.navbar-inverse{background-color:#222;border-color:#080808}.navbar-inverse .navbar-brand{color:#999}.navbar-inverse .navbar-brand:hover,.navbar-inverse .navbar-brand:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-text{color:#999}.navbar-inverse .navbar-nav>li>a{color:#999}.navbar-inverse .navba
 r-nav>li>a:hover,.navbar-inverse .navbar-nav>li>a:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:hover,.navbar-inverse .navbar-nav>.active>a:focus{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.disabled>a,.navbar-inverse .navbar-nav>.disabled>a:hover,.navbar-inverse .navbar-nav>.disabled>a:focus{color:#444;background-color:transparent}.navbar-inverse .navbar-toggle{border-color:#333}.navbar-inverse .navbar-toggle:hover,.navbar-inverse .navbar-toggle:focus{background-color:#333}.navbar-inverse .navbar-toggle .icon-bar{background-color:#fff}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#101010}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:hover,.navbar-inverse .navbar-nav>.open>a:focus{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.dropdown>a:hover .caret{border-top-color:#fff;border-bottom-color:#fff}.navbar-inverse .nav
 bar-nav>.dropdown>a .caret{border-top-color:#999;border-bottom-color:#999}.navbar-inverse .navbar-nav>.open>a .caret,.navbar-inverse .navbar-nav>.open>a:hover .caret,.navbar-inverse .navbar-nav>.open>a:focus .caret{border-top-color:#fff;border-bottom-color:#fff}@media(max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a{color:#999}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:hover,.navbar-inverse .navbar-nav .open .dropdown-me
 nu>.disabled>a:focus{color:#444;background-color:transparent}}.navbar-inverse .navbar-link{color:#999}.navbar-inverse .navbar-link:hover{color:#fff}.breadcrumb{padding:8px 15px;margin-bottom:20px;list-style:none;background-color:#f5f5f5;border-radius:4px}.breadcrumb>li{display:inline-block}.breadcrumb>li+li:before{padding:0 5px;color:#ccc;content:"/\00a0"}.breadcrumb>.active{color:#999}.pagination{display:inline-block;padding-left:0;margin:20px 0;border-radius:4px}.pagination>li{display:inline}.pagination>li>a,.pagination>li>span{position:relative;float:left;padding:6px 12px;margin-left:-1px;line-height:1.428571429;text-decoration:none;background-color:#fff;border:1px solid #ddd}.pagination>li:first-child>a,.pagination>li:first-child>span{margin-left:0;border-bottom-left-radius:4px;border-top-left-radius:4px}.pagination>li:last-child>a,.pagination>li:last-child>span{border-top-right-radius:4px;border-bottom-right-radius:4px}.pagination>li>a:hover,.pagination>li>span:hover,.paginatio
 n>li>a:focus,.pagination>li>span:focus{background-color:#eee}.pagination>.active>a,.pagination>.active>span,.pagination>.active>a:hover,.pagination>.active>span:hover,.pagination>.active>a:focus,.pagination>.active>span:focus{z-index:2;color:#fff;cursor:default;background-color:#428bca;border-color:#428bca}.pagination>.disabled>span,.pagination>.disabled>span:hover,.pagination>.disabled>span:focus,.pagination>.disabled>a,.pagination>.disabled>a:hover,.pagination>.disabled>a:focus{color:#999;cursor:not-allowed;background-color:#fff;border-color:#ddd}.pagination-lg>li>a,.pagination-lg>li>span{padding:10px 16px;font-size:18px}.pagination-lg>li:first-child>a,.pagination-lg>li:first-child>span{border-bottom-left-radius:6px;border-top-left-radius:6px}.pagination-lg>li:last-child>a,.pagination-lg>li:last-child>span{border-top-right-radius:6px;border-bottom-right-radius:6px}.pagination-sm>li>a,.pagination-sm>li>span{padding:5px 10px;font-size:12px}.pagination-sm>li:first-child>a,.pagination
 -sm>li:first-child>span{border-bottom-left-radius:3px;border-top-left-radius:3px}.pagination-sm>li:last-child>a,.pagination-sm>li:last-child>span{border-top-right-radius:3px;border-bottom-right-radius:3px}.pager{padding-left:0;margin:20px 0;text-align:center;list-style:none}.pager:before,.pager:after{display:table;content:" "}.pager:after{clear:both}.pager:before,.pager:after{display:table;content:" "}.pager:after{clear:both}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;border-radius:15px}.pager li>a:hover,.pager li>a:focus{text-decoration:none;background-color:#eee}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:hover,.pager .disabled>a:focus,.pager .disabled>span{color:#999;cursor:not-allowed;background-color:#fff}.label{display:inline;padding:.2em .6em .3em;font-size:75%;font-weight:bold;line-height:1;color:
 #fff;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25em}.label[href]:hover,.label[href]:focus{color:#fff;text-decoration:none;cursor:pointer}.label:empty{display:none}.label-default{background-color:#999}.label-default[href]:hover,.label-default[href]:focus{background-color:#808080}.label-primary{background-color:#428bca}.label-primary[href]:hover,.label-primary[href]:focus{background-color:#3071a9}.label-success{background-color:#5cb85c}.label-success[href]:hover,.label-success[href]:focus{background-color:#449d44}.label-info{background-color:#5bc0de}.label-info[href]:hover,.label-info[href]:focus{background-color:#31b0d5}.label-warning{background-color:#f0ad4e}.label-warning[href]:hover,.label-warning[href]:focus{background-color:#ec971f}.label-danger{background-color:#d9534f}.label-danger[href]:hover,.label-danger[href]:focus{background-color:#c9302c}.badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:12px;font-weight:bold;line-heigh
 t:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;background-color:#999;border-radius:10px}.badge:empty{display:none}a.badge:hover,a.badge:focus{color:#fff;text-decoration:none;cursor:pointer}.btn .badge{position:relative;top:-1px}a.list-group-item.active>.badge,.nav-pills>.active>a>.badge{color:#428bca;background-color:#fff}.nav-pills>li>a>.badge{margin-left:3px}.jumbotron{padding:30px;margin-bottom:30px;font-size:21px;font-weight:200;line-height:2.1428571435;color:inherit;background-color:#eee}.jumbotron h1{line-height:1;color:inherit}.jumbotron p{line-height:1.4}.container .jumbotron{border-radius:6px}@media screen and (min-width:768px){.jumbotron{padding-top:48px;padding-bottom:48px}.container .jumbotron{padding-right:60px;padding-left:60px}.jumbotron h1{font-size:63px}}.thumbnail{display:inline-block;display:block;height:auto;max-width:100%;padding:4px;margin-bottom:20px;line-height:1.428571429;background-color:#fff;border:1px solid #ddd;border-radius:
 4px;-webkit-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.thumbnail>img{display:block;height:auto;max-width:100%}a.thumbnail:hover,a.thumbnail:focus{border-color:#428bca}.thumbnail>img{margin-right:auto;margin-left:auto}.thumbnail .caption{padding:9px;color:#333}.alert{padding:15px;margin-bottom:20px;border:1px solid transparent;border-radius:4px}.alert h4{margin-top:0;color:inherit}.alert .alert-link{font-weight:bold}.alert>p,.alert>ul{margin-bottom:0}.alert>p+p{margin-top:5px}.alert-dismissable{padding-right:35px}.alert-dismissable .close{position:relative;top:-2px;right:-21px;color:inherit}.alert-success{color:#468847;background-color:#dff0d8;border-color:#d6e9c6}.alert-success hr{border-top-color:#c9e2b3}.alert-success .alert-link{color:#356635}.alert-info{color:#3a87ad;background-color:#d9edf7;border-color:#bce8f1}.alert-info hr{border-top-color:#a6e1ec}.alert-info .alert-link{color:#2d6987}.alert-warning{color:#c09853;background-color:#fcf8e3;border-color:#fbe
 ed5}.alert-warning hr{border-top-color:#f8e5be}.alert-warning .alert-link{color:#a47e3c}.alert-danger{color:#b94a48;background-color:#f2dede;border-color:#eed3d7}.alert-danger hr{border-top-color:#e6c1c7}.alert-danger .alert-link{color:#953b39}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-moz-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-o-keyframes progress-bar-stripes{from{background-position:0 0}to{background-position:40px 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}.progress{height:20px;margin-bottom:20px;overflow:hidden;background-color:#f5f5f5;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1)}.progress-bar{float:left;width:0;height:100%;font-size:12px;color:#fff;text-align:center;background-color:#428bca;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);box-shadow
 :inset 0 -1px 0 rgba(0,0,0,0.15);-webkit-transition:width .6s ease;transition:width .6s ease}.progress-striped .progress-bar{background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-size:40px 40px}.progress.act
 ive .progress-bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-moz-animation:progress-bar-stripes 2s linear infinite;-ms-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-bar-success{background-color:#5cb85c}.progress-striped .progress-bar-success{background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%
 ,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-bar-info{background-color:#5bc0de}.progress-striped .progress-bar-info{background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,2
 55,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-bar-warning{background-color:#f0ad4e}.progress-striped .progress-bar-warning{background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(
 255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-bar-danger{background-color:#d9534f}.progress-striped .progress-bar-danger{background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.media,.media-body{overflow:
 hidden;zoom:1}.media,.media .media{margin-top:15px}.media:first-child{margin-top:0}.media-object{display:block}.media-heading{margin:0 0 5px}.media>.pull-left{margin-right:10px}.media>.pull-right{margin-left:10px}.media-list{padding-left:0;list-style:none}.list-group{padding-left:0;margin-bottom:20px}.list-group-item{position:relative;display:block;padding:10px 15px;margin-bottom:-1px;background-color:#fff;border:1px solid #ddd}.list-group-item:first-child{border-top-right-radius:4px;border-top-left-radius:4px}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}.list-group-item>.badge{float:right}.list-group-item>.badge+.badge{margin-right:5px}a.list-group-item{color:#555}a.list-group-item .list-group-item-heading{color:#333}a.list-group-item:hover,a.list-group-item:focus{text-decoration:none;background-color:#f5f5f5}.list-group-item.active,.list-group-item.active:hover,.list-group-item.active:focus{z-index:2;color:#fff;background
 -color:#428bca;border-color:#428bca}.list-group-item.active .list-group-item-heading,.list-group-item.active:hover .list-group-item-heading,.list-group-item.active:focus .list-group-item-heading{color:inherit}.list-group-item.active .list-group-item-text,.list-group-item.active:hover .list-group-item-text,.list-group-item.active:focus .list-group-item-text{color:#e1edf7}.list-group-item-heading{margin-top:0;margin-bottom:5px}.list-group-item-text{margin-bottom:0;line-height:1.3}.panel{margin-bottom:20px;background-color:#fff;border:1px solid transparent;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,0.05);box-shadow:0 1px 1px rgba(0,0,0,0.05)}.panel-body{padding:15px}.panel-body:before,.panel-body:after{display:table;content:" "}.panel-body:after{clear:both}.panel-body:before,.panel-body:after{display:table;content:" "}.panel-body:after{clear:both}.panel>.list-group{margin-bottom:0}.panel>.list-group .list-group-item{border-width:1px 0}.panel>.list-group .list-group-item:
 first-child{border-top-right-radius:0;border-top-left-radius:0}.panel>.list-group .list-group-item:last-child{border-bottom:0}.panel-heading+.list-group .list-group-item:first-child{border-top-width:0}.panel>.table{margin-bottom:0}.panel>.panel-body+.table{border-top:1px solid #ddd}.panel-heading{padding:10px 15px;border-bottom:1px solid transparent;border-top-right-radius:3px;border-top-left-radius:3px}.panel-title{margin-top:0;margin-bottom:0;font-size:16px}.panel-title>a{color:inherit}.panel-footer{padding:10px 15px;background-color:#f5f5f5;border-top:1px solid #ddd;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel-group .panel{margin-bottom:0;overflow:hidden;border-radius:4px}.panel-group .panel+.panel{margin-top:5px}.panel-group .panel-heading{border-bottom:0}.panel-group .panel-heading+.panel-collapse .panel-body{border-top:1px solid #ddd}.panel-group .panel-footer{border-top:0}.panel-group .panel-footer+.panel-collapse .panel-body{border-bottom:1px solid #dd
 d}.panel-default{border-color:#ddd}.panel-default>.panel-heading{color:#333;background-color:#f5f5f5;border-color:#ddd}.panel-default>.panel-heading+.panel-collapse .panel-body{border-top-color:#ddd}.panel-default>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#ddd}.panel-primary{border-color:#428bca}.panel-primary>.panel-heading{color:#fff;background-color:#428bca;border-color:#428bca}.panel-primary>.panel-heading+.panel-collapse .panel-body{border-top-color:#428bca}.panel-primary>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#428bca}.panel-success{border-color:#d6e9c6}.panel-success>.panel-heading{color:#468847;background-color:#dff0d8;border-color:#d6e9c6}.panel-success>.panel-heading+.panel-collapse .panel-body{border-top-color:#d6e9c6}.panel-success>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#d6e9c6}.panel-warning{border-color:#fbeed5}.panel-warning>.panel-heading{color:#c09853;background-color:#fcf8e3;border-color:#fbeed5}.pane
 l-warning>.panel-heading+.panel-collapse .panel-body{border-top-color:#fbeed5}.panel-warning>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#fbeed5}.panel-danger{border-color:#eed3d7}.panel-danger>.panel-heading{color:#b94a48;background-color:#f2dede;border-color:#eed3d7}.panel-danger>.panel-heading+.panel-collapse .panel-body{border-top-color:#eed3d7}.panel-danger>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#eed3d7}.panel-info{border-color:#bce8f1}.panel-info>.panel-heading{color:#3a87ad;background-color:#d9edf7;border-color:#bce8f1}.panel-info>.panel-heading+.panel-collapse .panel-body{border-top-color:#bce8f1}.panel-info>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#bce8f1}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);box-shadow:inset 0 1px 1px rgba(0,0,0,0.05)}.well blockquote{border-color:#ddd;border-co
 lor:rgba(0,0,0,0.15)}.well-lg{padding:24px;border-radius:6px}.well-sm{padding:9px;border-radius:3px}.close{float:right;font-size:21px;font-weight:bold;line-height:1;color:#000;text-shadow:0 1px 0 #fff;opacity:.2;filter:alpha(opacity=20)}.close:hover,.close:focus{color:#000;text-decoration:none;cursor:pointer;opacity:.5;filter:alpha(opacity=50)}button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-appearance:none}.modal-open{overflow:hidden}body.modal-open,.modal-open .navbar-fixed-top,.modal-open .navbar-fixed-bottom{margin-right:15px}.modal{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;display:none;overflow:auto;overflow-y:scroll}.modal.fade .modal-dialog{-webkit-transform:translate(0,-25%);-ms-transform:translate(0,-25%);transform:translate(0,-25%);-webkit-transition:-webkit-transform .3s ease-out;-moz-transition:-moz-transform .3s ease-out;-o-transition:-o-transform .3s ease-out;transition:transform .3s ease-out}.modal.in .modal-dialog{-webkit-
 transform:translate(0,0);-ms-transform:translate(0,0);transform:translate(0,0)}.modal-dialog{z-index:1050;width:auto;padding:10px;margin-right:auto;margin-left:auto}.modal-content{position:relative;background-color:#fff;border:1px solid #999;border:1px solid rgba(0,0,0,0.2);border-radius:6px;outline:0;-webkit-box-shadow:0 3px 9px rgba(0,0,0,0.5);box-shadow:0 3px 9px rgba(0,0,0,0.5);background-clip:padding-box}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1030;background-color:#000}.modal-backdrop.fade{opacity:0;filter:alpha(opacity=0)}.modal-backdrop.in{opacity:.5;filter:alpha(opacity=50)}.modal-header{min-height:16.428571429px;padding:15px;border-bottom:1px solid #e5e5e5}.modal-header .close{margin-top:-2px}.modal-title{margin:0;line-height:1.428571429}.modal-body{position:relative;padding:20px}.modal-footer{padding:19px 20px 20px;margin-top:15px;text-align:right;border-top:1px solid #e5e5e5}.modal-footer:before,.modal-footer:after{display:table;content:" "}.
 modal-footer:after{clear:both}.modal-footer:before,.modal-footer:after{display:table;content:" "}.modal-footer:after{clear:both}.modal-footer .btn+.btn{margin-bottom:0;margin-left:5px}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}@media screen and (min-width:768px){.modal-dialog{right:auto;left:50%;width:600px;padding-top:30px;padding-bottom:30px}.modal-content{-webkit-box-shadow:0 5px 15px rgba(0,0,0,0.5);box-shadow:0 5px 15px rgba(0,0,0,0.5)}}.tooltip{position:absolute;z-index:1030;display:block;font-size:12px;line-height:1.4;opacity:0;filter:alpha(opacity=0);visibility:visible}.tooltip.in{opacity:.9;filter:alpha(opacity=90)}.tooltip.top{padding:5px 0;margin-top:-3px}.tooltip.right{padding:0 5px;margin-left:3px}.tooltip.bottom{padding:5px 0;margin-top:3px}.tooltip.left{padding:0 5px;margin-left:-3px}.tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:center;text-decoration:none;background-color:#000;border-ra
 dius:4px}.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-top-color:#000;border-width:5px 5px 0}.tooltip.top-left .tooltip-arrow{bottom:0;left:5px;border-top-color:#000;border-width:5px 5px 0}.tooltip.top-right .tooltip-arrow{right:5px;bottom:0;border-top-color:#000;border-width:5px 5px 0}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-right-color:#000;border-width:5px 5px 5px 0}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-left-color:#000;border-width:5px 0 5px 5px}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-bottom-color:#000;border-width:0 5px 5px}.tooltip.bottom-left .tooltip-arrow{top:0;left:5px;border-bottom-color:#000;border-width:0 5px 5px}.tooltip.bottom-right .tooltip-arrow{top:0;right:5px;border-bottom-color:#000;border-width:0 5px 5px}.popover{position:absolute;top:0;left:0;z-index:1010;displ
 ay:none;max-width:276px;padding:1px;text-align:left;white-space:normal;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2);background-clip:padding-box}.popover.top{margin-top:-10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-left:-10px}.popover-title{padding:8px 14px;margin:0;font-size:14px;font-weight:normal;line-height:18px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-radius:5px 5px 0 0}.popover-content{padding:9px 14px}.popover .arrow,.popover .arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.popover .arrow{border-width:11px}.popover .arrow:after{border-width:10px;content:""}.popover.top .arrow{bottom:-11px;left:50%;margin-left:-11px;border-top-color:#999;border-top-color:rgba(0,0,0,0.25);border-bottom-width:0}.popover.top .arrow:after{bott
 om:1px;margin-left:-10px;border-top-color:#fff;border-bottom-width:0;content:" "}.popover.right .arrow{top:50%;left:-11px;margin-top:-11px;border-right-color:#999;border-right-color:rgba(0,0,0,0.25);border-left-width:0}.popover.right .arrow:after{bottom:-10px;left:1px;border-right-color:#fff;border-left-width:0;content:" "}.popover.bottom .arrow{top:-11px;left:50%;margin-left:-11px;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,0.25);border-top-width:0}.popover.bottom .arrow:after{top:1px;margin-left:-10px;border-bottom-color:#fff;border-top-width:0;content:" "}.popover.left .arrow{top:50%;right:-11px;margin-top:-11px;border-left-color:#999;border-left-color:rgba(0,0,0,0.25);border-right-width:0}.popover.left .arrow:after{right:1px;bottom:-10px;border-left-color:#fff;border-right-width:0;content:" "}.carousel{position:relative}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel-inner>.item{position:relative;display:none;-webkit-transition:.6s ease-in-out 
 left;transition:.6s ease-in-out left}.carousel-inner>.item>img,.carousel-inner>.item>a>img{display:block;height:auto;max-width:100%;line-height:1}.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block}.carousel-inner>.active{left:0}.carousel-inner>.next,.carousel-inner>.prev{position:absolute;top:0;width:100%}.carousel-inner>.next{left:100%}.carousel-inner>.prev{left:-100%}.carousel-inner>.next.left,.carousel-inner>.prev.right{left:0}.carousel-inner>.active.left{left:-100%}.carousel-inner>.active.right{left:100%}.carousel-control{position:absolute;top:0;bottom:0;left:0;width:15%;font-size:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,0.6);opacity:.5;filter:alpha(opacity=50)}.carousel-control.left{background-image:-webkit-gradient(linear,0 top,100% top,from(rgba(0,0,0,0.5)),to(rgba(0,0,0,0.0001)));background-image:-webkit-linear-gradient(left,color-stop(rgba(0,0,0,0.5) 0),color-stop(rgba(0,0,0,0.0001) 100%));background-image:-moz-linear
 -gradient(left,rgba(0,0,0,0.5) 0,rgba(0,0,0,0.0001) 100%);background-image:linear-gradient(to right,rgba(0,0,0,0.5) 0,rgba(0,0,0,0.0001) 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000',endColorstr='#00000000',GradientType=1)}.carousel-control.right{right:0;left:auto;background-image:-webkit-gradient(linear,0 top,100% top,from(rgba(0,0,0,0.0001)),to(rgba(0,0,0,0.5)));background-image:-webkit-linear-gradient(left,color-stop(rgba(0,0,0,0.0001) 0),color-stop(rgba(0,0,0,0.5) 100%));background-image:-moz-linear-gradient(left,rgba(0,0,0,0.0001) 0,rgba(0,0,0,0.5) 100%);background-image:linear-gradient(to right,rgba(0,0,0,0.0001) 0,rgba(0,0,0,0.5) 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000',endColorstr='#80000000',GradientType=1)}.carousel-control:hover,.carousel-control:focus{color:#fff;text-decoration:none;opacity:.9;filter:alpha(opacity=90)}.carousel-control .icon-
 prev,.carousel-control .icon-next,.carousel-control .glyphicon-chevron-left,.carousel-control .glyphi

<TRUNCATED>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/website/tmp/dependencies
----------------------------------------------------------------------
diff --git a/website/tmp/dependencies b/website/tmp/dependencies
new file mode 100644
index 0000000..8622d07
Binary files /dev/null and b/website/tmp/dependencies differ

[11/60] [abbrv] incubator-usergrid git commit: cherry picking docs from master

[sn...@apache.org]

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/rest-endpoints/api-docs.html
----------------------------------------------------------------------
diff --git a/content/docs/rest-endpoints/api-docs.html b/content/docs/rest-endpoints/api-docs.html
new file mode 100644
index 0000000..7368826
--- /dev/null
+++ b/content/docs/rest-endpoints/api-docs.html
@@ -0,0 +1,4192 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>Methods &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+        <link rel="next" title="COMING SOON..." href="../sdks/tbd.html"/>
+        <link rel="prev" title="Application" href="../orgs-and-apps/application.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul class="current">
+<li class="toctree-l1 current"><a class="current reference internal" href="">Methods</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#action-methods">Action Methods</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#activityfeed-methods">ActivityFeed Methods</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#appdata-methods">AppData Methods</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#credential-methods">Credential Methods</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#devices-methods">Devices Methods</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#entity-methods">Entity Methods</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#event-methods">Event Methods</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#group-methods">Group Methods</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#notification-methods">Notification Methods</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#organization-methods">Organization Methods</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#permission-methods">Permission Methods</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#receipt-methods">Receipt Methods</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#role-methods">Role Methods</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#user-methods">User Methods</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="#models">Models</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#action">Action</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#activityfeed">ActivityFeed</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#actor">Actor</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#addpermission">AddPermission</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#addrole">AddRole</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#adminuserupdate">AdminUserUpdate</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#appdata">AppData</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#cancelmsg">CancelMSG</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#collections">Collections</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#createactivity">CreateActivity</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#createadminuser">CreateAdminUser</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#createapp">CreateApp</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#createentities">CreateEntities</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#createentity">CreateEntity</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#createevent">CreateEvent</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#creategroup">CreateGroup</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#createnotification">CreateNotification</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#createnotifications">CreateNotifications</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#createorg">CreateOrg</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#createuser">CreateUser</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#credential">Credential</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#device">Device</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#entity">Entity</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#error">Error</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#event">Event</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#group">Group</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#imagemodel">ImageModel</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#metadata">Metadata</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#notification">Notification</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#notifier">Notifier</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#object">Object</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#organization">Organization</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#permission">Permission</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#receipt">Receipt</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#resetpw">ResetPW</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#resetpwmsg">ResetPWMsg</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#role">Role</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#schedulenotification">ScheduleNotification</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#setexpiration">SetExpiration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#sets">Sets</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#user">User</a></li>
+</ul>
+</li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>Methods</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/rest-endpoints/api-docs.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="methods">
+<h1>Methods<a class="headerlink" href="#methods" title="Permalink to this headline">¶</a></h1>
+<div class="section" id="action-methods">
+<h2>Action Methods<a class="headerlink" href="#action-methods" title="Permalink to this headline">¶</a></h2>
+<h2 class="usergrid-GET-heading"><p>GET /management/orgs/{orgId}/activate</p>
+</h2><p>Activate an organization from a link provIded in an email notification.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>orgId</strong> (string) One of the organization&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>token</strong> () Activation token. (Specified in query).</li>
+<li><strong>confirm_email</strong> () Send confirmation email or not. (Specified in
+query).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of complete messages.</li>
+<li>Schema: <a class="reference external" href="#action">Action</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+<h2 class="usergrid-GET-heading"><p>GET /management/orgs/{orgId}/reactivate</p>
+</h2><p>Reactivate an expired organization.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>orgId</strong> (string) One of the organization&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of complete messages.</li>
+<li>Schema: <a class="reference external" href="#action">Action</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+<h2 class="usergrid-GET-heading"><p>GET /management/users/resetpw</p>
+</h2><p>Initiate the reset of an admin user&#8217;s password.</p>
+<h3><p>Parameters</p>
+</h3>
+
+
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of complete messages.</li>
+<li>Schema: <a class="reference external" href="#action">Action</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+<h2 class="usergrid-POST-heading"><p>POST /management/users/resetpw</p>
+</h2><p>Complete the password reset through getting the newpassword and the old
+one for identification.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>ResetPWMsg</strong> (<a class="reference external" href="#resetpwmsg">ResetPWMsg</a>) Parameters and value
+for the Captcha challenge, the admin user&#8217;s response to the Captcha
+challenge, and the admin user&#8217;s email address. (Specified in body).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of complete messages.</li>
+<li>Schema: <a class="reference external" href="#action">Action</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+<h2 class="usergrid-GET-heading"><p>GET /management/users/{userId}/activate</p>
+</h2><p>Activate an admin user from a link provIded in an email notification.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>userId</strong> (string) One of the user&#8217;s identification which includes
+username, real name, email address or UUID. (Specified in path).</li>
+<li><strong>token</strong> () Activation token&#8217;s query statement. (Specified in
+query).</li>
+<li><strong>confirm_email</strong> () Query statement of whether send confimation
+email or not. (Specified in query).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of complete messages.</li>
+<li>Schema: <a class="reference external" href="#action">Action</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+<h2 class="usergrid-PUT-heading"><p>PUT /management/users/{userId}/password</p>
+</h2><p>Update an admin user&#8217;s password through getting the newpassword and the
+old one for identification.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>userId</strong> (string) One of the user&#8217;s identification which includes
+username, real name, email address or UUID. (Specified in path).</li>
+<li><strong>ResetPW</strong> (<a class="reference external" href="#resetpw">ResetPW</a>) The user&#8217;s old and new password.
+(Specified in body).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of complete messages.</li>
+<li>Schema: <a class="reference external" href="#action">Action</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+<h2 class="usergrid-GET-heading"><p>GET /management/users/{userId}/reactivate</p>
+</h2><p>Reactivate an expired admin user.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>userId</strong> (string) One of the user&#8217;s identification which includes
+username, real name, email address or UUID. (Specified in path).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of complete messages.</li>
+<li>Schema: <a class="reference external" href="#action">Action</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+<h2 class="usergrid-POST-heading"><p>POST /{orgId}/{appId}/users/{user}/password</p>
+</h2><p>Set a user&#8217;s password or reset the user&#8217;s existing password.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>orgId</strong> (string) One of the organization&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>appId</strong> (string) One of the application&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>username</strong> (string) The username of the user. (Specified in path).</li>
+<li><strong>ResetPW</strong> (<a class="reference external" href="#resetpw">ResetPW</a>) The user&#8217;s old and new password.
+(Specified in body).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of complete messages.</li>
+<li>Schema: <a class="reference external" href="#action">Action</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+</div>
+<div class="section" id="activityfeed-methods">
+<h2>ActivityFeed Methods<a class="headerlink" href="#activityfeed-methods" title="Permalink to this headline">¶</a></h2>
+<h2 class="usergrid-GET-heading"><p>GET /management/orgs/{orgId}/feed</p>
+</h2><p>Retrieve an organization&#8217;s activity feed.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>orgId</strong> (string) One of the organization&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of the organization&#8217;s ActivityFeed.</li>
+<li>Schema: <a class="reference external" href="#activityfeed">ActivityFeed</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+<h2 class="usergrid-GET-heading"><p>GET /management/users/{userId}/feed</p>
+</h2><p>Retrieve an admin user&#8217;s activity feed.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>userId</strong> (string) One of the user&#8217;s identification which includes
+username, real name, email address or UUID. (Specified in path).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of user&#8217;s activity</li>
+<li>Schema: <a class="reference external" href="#activityfeed">ActivityFeed</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+<h2 class="usergrid-POST-heading"><p>POST /{orgId}/{appId}/groups/{groupId}/activities</p>
+</h2><p>Create an activity to a specific group. In this case the activity is
+created in the activities collection and is accessible at the
+/activities endpoint to users who have the permission to read that
+endpoint. In addition, a relationship is established between the
+activity and the group, and because of that, the activity will appear in
+the group’s feed. The group &#8216;owns&#8217; the activity. Also, the activity will
+be published in the feed of all users that are members of the group.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>orgId</strong> (string) One of the organization&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>appId</strong> (string) One of the application&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>groupId</strong> (string) One of the group&#8217;s identification which includes
+name or uuid. (Specified in path).</li>
+<li><strong>CreateActivity</strong> (<a class="reference external" href="#createactivity">CreateActivity</a>) One or more
+sets of activity properties. (Specified in body).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of user&#8217;s activity.</li>
+<li>Schema: <a class="reference external" href="#activityfeed">ActivityFeed</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+<h2 class="usergrid-GET-heading"><p>GET /{orgId}/{appId}/groups/{groupId}/feed</p>
+</h2><p>Get a group&#8217;s feed through providing all the identifications.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>orgId</strong> (string) One of the organization&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>appId</strong> (string) One of the application&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>groupId</strong> (string) One of the group&#8217;s identification which includes
+name or uuid. (Specified in path).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of group&#8217;s activity.</li>
+<li>Schema: <a class="reference external" href="#activityfeed">ActivityFeed</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+<h2 class="usergrid-POST-heading"><p>POST /{orgId}/{appId}/users/{userId}/activities</p>
+</h2><p>Create an activity in the activities collection.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>orgId</strong> (string) One of the organization&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>appId</strong> (string) One of the application&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>userId-3</strong> (string) One of the user&#8217;s identification which includes
+username or UUID. (Specified in path).</li>
+<li><strong>CreateActivity</strong> (<a class="reference external" href="#createactivity">CreateActivity</a>) One or more
+sets of activity properties. (Specified in body).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of user&#8217;s activity.</li>
+<li>Schema: <a class="reference external" href="#activityfeed">ActivityFeed</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+<h2 class="usergrid-GET-heading"><p>GET /{orgId}/{appId}/users/{userId}/feed</p>
+</h2><p>Retrieve a user&#8217;s feed through providing all the identifications.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>orgId</strong> (string) One of the organization&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>appId</strong> (string) One of the application&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>userId-3</strong> (string) One of the user&#8217;s identification which includes
+username or UUID. (Specified in path).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of user&#8217;s activity feed.</li>
+<li>Schema: <a class="reference external" href="#activityfeed">ActivityFeed</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+</div>
+<div class="section" id="appdata-methods">
+<h2>AppData Methods<a class="headerlink" href="#appdata-methods" title="Permalink to this headline">¶</a></h2>
+<h2 class="usergrid-GET-heading"><p>GET /management/orgs/{orgId}/apps</p>
+</h2><p>Retrieve the applications in an organization through providing both Id
+of application and organization.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>orgId</strong> (string) One of the organization&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of retrieved application data.</li>
+<li>Schema: <a class="reference external" href="#appdata">AppData</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+<h2 class="usergrid-DELETE-heading"><p>DELETE /management/orgs/{orgId}/apps/{appId}</p>
+</h2><p>Remove an application from an organization through providing both Id of
+application and organization.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>orgId</strong> (string) One of the organization&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>appId</strong> (string) One of the application&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of deleted application info.</li>
+<li>Schema: <a class="reference external" href="#appdata">AppData</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+</div>
+<div class="section" id="credential-methods">
+<h2>Credential Methods<a class="headerlink" href="#credential-methods" title="Permalink to this headline">¶</a></h2>
+<h2 class="usergrid-GET-heading"><p>GET /management/orgs/{orgId}/apps/{appId}/credentials</p>
+</h2><p>Retrieve the client Id and client secret credentials for an application
+in an organization.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>orgId</strong> (string) One of the organization&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>appId</strong> (string) One of the application&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of retrieved credentials info.</li>
+<li>Schema: <a class="reference external" href="#credential">Credential</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+<h2 class="usergrid-POST-heading"><p>POST /management/orgs/{orgId}/apps/{appId}/credentials</p>
+</h2><p>Generate the client Id and client secret credentials for an application
+in an organization.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>orgId</strong> (string) One of the organization&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>appId</strong> (string) One of the application&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of generated credentials info.</li>
+<li>Schema: <a class="reference external" href="#credential">Credential</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+<h2 class="usergrid-GET-heading"><p>GET /management/orgs/{orgId}/credentials</p>
+</h2><p>Retrieve the credentials for an organization client.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>orgId</strong> (string) One of the organization&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of Credential</li>
+<li>Schema: <a class="reference external" href="#credential">Credential</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+<h2 class="usergrid-POST-heading"><p>POST /management/orgs/{orgId}/credentials</p>
+</h2><p>Generate whole new credentials for an organization client.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>orgId</strong> (string) One of the organization&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of Credential</li>
+<li>Schema: <a class="reference external" href="#credential">Credential</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+</div>
+<div class="section" id="devices-methods">
+<h2>Devices Methods<a class="headerlink" href="#devices-methods" title="Permalink to this headline">¶</a></h2>
+<h2 class="usergrid-GET-heading"><p>GET /{orgId}/{appId}/{notificationId}/*/queue</p>
+</h2><p>Retrieve the list of devices associated with one or more notifications
+before the notifications are sent through providing all the
+identifications.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>orgId</strong> (string) One of the organization&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>appId</strong> (string) One of the application&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>notificationId</strong> (string) One of the notification&#8217;s identification
+which includes name or uuid. (Specified in path).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of retrieved device&#8217;s info.</li>
+<li>Schema: <a class="reference external" href="#device">Device</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+</div>
+<div class="section" id="entity-methods">
+<h2>Entity Methods<a class="headerlink" href="#entity-methods" title="Permalink to this headline">¶</a></h2>
+<h2 class="usergrid-GET-heading"><p>GET /{orgId}/{appId}/users/{userId}/{relation}</p>
+</h2><p>Retrieve a user&#8217;s collections or connections through query statement.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>orgId</strong> (string) One of the organization&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>appId</strong> (string) One of the application&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>userId-3</strong> (string) One of the user&#8217;s identification which includes
+username or UUID. (Specified in path).</li>
+<li><strong>relation</strong> (string) The relation between user and collections.
+(Specified in path).</li>
+<li><strong>queryStatement</strong> () The query statement of the user. (Specified in
+query).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of user&#8217;s collections info.</li>
+<li>Schema: <a class="reference external" href="#entity">Entity</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+<h2 class="usergrid-GET-heading"><p>GET /{orgId}/{appId}/{collectionId}</p>
+</h2><p>Retrieve collection through query statement.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>orgId</strong> (string) One of the organization&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>appId</strong> (string) One of the application&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>collectionId</strong> (string) One of the collection&#8217;s identification
+which includes name or uuid. (Specified in path).</li>
+<li><strong>queryStatement</strong> () Any values specified in the query statement
+should be enclosed in single-quotes. (Specified in query).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of retrieved collection&#8217;s info.</li>
+<li>Schema: <a class="reference external" href="#entity">Entity</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+<h2 class="usergrid-PUT-heading"><p>PUT /{orgId}/{appId}/{collectionId}</p>
+</h2><p>Update collection through query statement.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>orgId</strong> (string) One of the organization&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>appId</strong> (string) One of the application&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>collectionId</strong> (string) One of the collection&#8217;s identification
+which includes name or uuid. (Specified in path).</li>
+<li><strong>queryStatement</strong> () Any values specified in the query statement
+should be enclosed in single-quotes. (Specified in query).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of updated collection&#8217;s info.</li>
+<li>Schema: <a class="reference external" href="#entity">Entity</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+<h2 class="usergrid-POST-heading"><p>POST /{orgId}/{appId}/{collectionId}/{entityId1}/{relation}/{entityId2}</p>
+</h2><p>Add an entity to a collection through providing all the identifications.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>orgId</strong> (string) One of the organization&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>appId</strong> (string) One of the application&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>collectionId</strong> (string) One of the collection&#8217;s identification
+which includes name or uuid. (Specified in path).</li>
+<li><strong>entityId1</strong> (string) The Id of the 1st entity. (Specified in path).</li>
+<li><strong>relation</strong> (string) The relation between 1st entity and 2nd entity.
+(Specified in path).</li>
+<li><strong>entityId2</strong> (string) The Id of the 2nd entity. (Specified in path).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of added entity&#8217;s info.</li>
+<li>Schema: <a class="reference external" href="#entity">Entity</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+<h2 class="usergrid-DELETE-heading"><p>DELETE
+/{orgId}/{appId}/{collectionId}/{entityId1}/{relation}/{entityId2}</p>
+</h2><p>Remove an entity from a collection through providing all the
+identifications.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>orgId</strong> (string) One of the organization&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>appId</strong> (string) One of the application&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>collectionId</strong> (string) One of the collection&#8217;s identification
+which includes name or uuid. (Specified in path).</li>
+<li><strong>entityId1</strong> (string) The Id of the 1st entity. (Specified in path).</li>
+<li><strong>relation</strong> (string) The relation between 1st entity and 2nd entity.
+(Specified in path).</li>
+<li><strong>entityId2</strong> (string) The Id of the 2nd entity. (Specified in path).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of deleted entity&#8217;s info.</li>
+<li>Schema: <a class="reference external" href="#entity">Entity</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+<h2 class="usergrid-GET-heading"><p>GET /{orgId}/{appId}/{collectionId}/{entityId}</p>
+</h2><p>Retrieve an entity through providing Id of application, organization,
+collection and entity.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>orgId</strong> (string) One of the organization&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>appId</strong> (string) One of the application&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>collectionId</strong> (string) One of the collection&#8217;s identification
+which includes name or uuid. (Specified in path).</li>
+<li><strong>entityId</strong> (string) One of the entity&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of retrieved entity&#8217;s info.</li>
+<li>Schema: <a class="reference external" href="#entity">Entity</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+<h2 class="usergrid-PUT-heading"><p>PUT /{orgId}/{appId}/{collectionId}/{entityId}</p>
+</h2><p>One or more properties can be updated with a single request.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>orgId</strong> (string) One of the organization&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>appId</strong> (string) One of the application&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>collectionId</strong> (string) One of the collection&#8217;s identification
+which includes name or uuid. (Specified in path).</li>
+<li><strong>entityId</strong> (string) One of the entity&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>entityproperty</strong> (<a class="reference external" href="#createentities">CreateEntities</a>) The
+properties of the entity. (Specified in body).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of updated entity&#8217;s info.</li>
+<li>Schema: <a class="reference external" href="#entity">Entity</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+<h2 class="usergrid-DELETE-heading"><p>DELETE /{orgId}/{appId}/{collectionId}/{entityId}</p>
+</h2><p>Delete an entity from the collection.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>orgId</strong> (string) One of the organization&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>appId</strong> (string) One of the application&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>collectionId</strong> (string) One of the collection&#8217;s identification
+which includes name or uuid. (Specified in path).</li>
+<li><strong>entityId</strong> (string) One of the entity&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of deleted entity&#8217;s info.</li>
+<li>Schema: <a class="reference external" href="#entity">Entity</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+<h2 class="usergrid-POST-heading"><p>POST /{orgId}/{appId}/{entitytype}</p>
+</h2><p>When a new entity is created, Usergrid will automatically create a
+corresponding collection if one does not already exist. The collection
+will automatically be named with the plural form of the entity type.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>orgId</strong> (string) One of the organization&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>appId</strong> (string) One of the application&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>entitytype</strong> (string) The entity type to create. (Specified in
+path).</li>
+<li><strong>entityproperty</strong> (<a class="reference external" href="#createentities">CreateEntities</a>) The
+properties of the entity. (Specified in body).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of created custom entity&#8217;s info.</li>
+<li>Schema: <a class="reference external" href="#entity">Entity</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+</div>
+<div class="section" id="event-methods">
+<h2>Event Methods<a class="headerlink" href="#event-methods" title="Permalink to this headline">¶</a></h2>
+<h2 class="usergrid-POST-heading"><p>POST /{orgId}/{appId}/events</p>
+</h2><p>Create an event through providing both Id of organization and
+application.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>orgId</strong> (string) One of the organization&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>appId</strong> (string) One of the application&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>CreateEvent</strong> (<a class="reference external" href="#createevent">CreateEvent</a>) The required
+property of the event. (Specified in body).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of created event&#8217;s info.</li>
+<li>Schema: <a class="reference external" href="#event">Event</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+</div>
+<div class="section" id="group-methods">
+<h2>Group Methods<a class="headerlink" href="#group-methods" title="Permalink to this headline">¶</a></h2>
+<h2 class="usergrid-POST-heading"><p>POST /{orgId}/{appId}/groups</p>
+</h2><p>Create a new group through providing both Id of organization and
+application.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>orgId</strong> (string) One of the organization&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>appId</strong> (string) One of the application&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>groupproperty</strong> (<a class="reference external" href="#creategroup">CreateGroup</a>) The property of
+the created group. (Specified in body).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of created group&#8217;s info.</li>
+<li>Schema: <a class="reference external" href="#group">Group</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+<h2 class="usergrid-GET-heading"><p>GET /{org_Id}/{app_Id}/groups/{groupId}</p>
+</h2><p>Get a group through through providing all the identifications.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>orgId</strong> (string) One of the organization&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>appId</strong> (string) One of the application&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>groupId</strong> (string) One of the group&#8217;s identification which includes
+name or uuid. (Specified in path).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of retrieved group&#8217;s info.</li>
+<li>Schema: <a class="reference external" href="#group">Group</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+<h2 class="usergrid-PUT-heading"><p>PUT /{org_Id}/{app_Id}/groups/{groupId}</p>
+</h2><p>Update a group through providing all the identifications.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>orgId</strong> (string) One of the organization&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>appId</strong> (string) One of the application&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>groupId</strong> (string) One of the group&#8217;s identification which includes
+name or uuid. (Specified in path).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of updated group&#8217;s info.</li>
+<li>Schema: <a class="reference external" href="#group">Group</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+</div>
+<div class="section" id="notification-methods">
+<h2>Notification Methods<a class="headerlink" href="#notification-methods" title="Permalink to this headline">¶</a></h2>
+<h2 class="usergrid-PUT-heading"><p>PUT /my-org/sandbox/notifications/{notificationId}</p>
+</h2><p>Cancel sent notifications through providing the Id of the notification.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>notificationId</strong> (string) One of the notification&#8217;s identification
+which includes name or uuid. (Specified in path).</li>
+<li><strong>cancelMsg</strong> (<a class="reference external" href="#cancelmsg">CancelMSG</a>) Indicete whether is
+canceled or not. (Specified in body).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of canceled notification&#8217;s info.</li>
+<li>Schema: <a class="reference external" href="#notification">Notification</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+<h2 class="usergrid-POST-heading"><p>POST /{orgId}/{appId}/devices</p>
+</h2><p>Create notifications for user through targeting by location and
+providing all the identifications.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>orgId</strong> (string) One of the organization&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>appId</strong> (string) One of the application&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>notification</strong> (<a class="reference external" href="#createnotifications">CreateNotifications</a>)
+These parameters are used when forming the notification portion of
+the request. (Specified in body).</li>
+<li><strong>scheduleNotification</strong>
+(<a class="reference external" href="#schedulenotification">ScheduleNotification</a>) To schedule a
+notification for a later time add the deliver parameter with a UNIX
+timestamp to the body of your request. (Specified in body).</li>
+<li><strong>setExpiration</strong> (<a class="reference external" href="#setexpiration">SetExpiration</a>) If a push
+service can&#8217;t deliver a message to a device and needs to resend it
+you can set a notification to expire after a certain date/time.
+(Specified in body).</li>
+<li><strong>queryStatement</strong> () The query statement of the location of the
+user. (Specified in query).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of created notification&#8217;s info.</li>
+<li>Schema: <a class="reference external" href="#notification">Notification</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+<h2 class="usergrid-POST-heading"><p>POST /{orgId}/{appId}/devices/*/notifications</p>
+</h2><p>Create notifications for all devices. This request will target all
+device entities.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>orgId</strong> (string) One of the organization&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>appId</strong> (string) One of the application&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>notification</strong> (<a class="reference external" href="#createnotifications">CreateNotifications</a>)
+These parameters are used when forming the notification portion of
+the request. (Specified in body).</li>
+<li><strong>scheduleNotification</strong>
+(<a class="reference external" href="#schedulenotification">ScheduleNotification</a>) To schedule a
+notification for a later time add the deliver parameter with a UNIX
+timestamp to the body of your request. (Specified in body).</li>
+<li><strong>setExpiration</strong> (<a class="reference external" href="#setexpiration">SetExpiration</a>) If a push
+service can&#8217;t deliver a message to a device and needs to resend it
+you can set a notification to expire after a certain date/time.
+(Specified in body).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of created notification&#8217;s info.</li>
+<li>Schema: <a class="reference external" href="#notification">Notification</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+<h2 class="usergrid-POST-heading"><p>POST /{orgId}/{appId}/devices/{deviceId}/notifications</p>
+</h2><p>Create notifications for a single device. This request will target a
+specific device entity.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>orgId</strong> (string) One of the organization&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>appId</strong> (string) One of the application&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>deviceId</strong> (string) One of the device&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>notification</strong> (<a class="reference external" href="#createnotifications">CreateNotifications</a>)
+These parameters are used when forming the notification portion of
+the request. (Specified in body).</li>
+<li><strong>scheduleNotification</strong>
+(<a class="reference external" href="#schedulenotification">ScheduleNotification</a>) To schedule a
+notification for a later time add the deliver parameter with a UNIX
+timestamp to the body of your request. (Specified in body).</li>
+<li><strong>setExpiration</strong> (<a class="reference external" href="#setexpiration">SetExpiration</a>) If a push
+service can&#8217;t deliver a message to a device and needs to resend it
+you can set a notification to expire after a certain date/time.
+(Specified in body).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of created notification&#8217;s info.</li>
+<li>Schema: <a class="reference external" href="#notification">Notification</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+<h2 class="usergrid-POST-heading"><p>POST /{orgId}/{appId}/groups/{path}/notifications</p>
+</h2><p>Create notifications for a group. This request will target all users
+associated with a specific group entity.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>orgId</strong> (string) One of the organization&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>appId</strong> (string) One of the application&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>path</strong> (string) The path of the group. (Specified in path).</li>
+<li><strong>notification</strong> (<a class="reference external" href="#createnotifications">CreateNotifications</a>)
+These parameters are used when forming the notification portion of
+the request. (Specified in body).</li>
+<li><strong>scheduleNotification</strong>
+(<a class="reference external" href="#schedulenotification">ScheduleNotification</a>) To schedule a
+notification for a later time add the deliver parameter with a UNIX
+timestamp to the body of your request. (Specified in body).</li>
+<li><strong>setExpiration</strong> (<a class="reference external" href="#setexpiration">SetExpiration</a>) If a push
+service can&#8217;t deliver a message to a device and needs to resend it
+you can set a notification to expire after a certain date/time.
+(Specified in body).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of created notification&#8217;s info.</li>
+<li>Schema: <a class="reference external" href="#notification">Notification</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+<h2 class="usergrid-GET-heading"><p>GET /{orgId}/{appId}/notifications</p>
+</h2><p>Retrieve one or more notifications through providing all the
+identifications.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>orgId</strong> (string) One of the organization&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>appId</strong> (string) One of the application&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of retrieved notification&#8217;s info.</li>
+<li>Schema: <a class="reference external" href="#notification">Notification</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+<h2 class="usergrid-DELETE-heading"><p>DELETE /{orgId}/{appId}/notifications/{notificationId}</p>
+</h2><p>Remove unsent notifications through providing all the identifications.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>orgId</strong> (string) One of the organization&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>appId</strong> (string) One of the application&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>notificationId</strong> (string) One of the notification&#8217;s identification
+which includes name or uuid. (Specified in path).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of deleted notification&#8217;s info.</li>
+<li>Schema: <a class="reference external" href="#notification">Notification</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+<h2 class="usergrid-POST-heading"><p>POST /{orgId}/{appId}/users/{userId}/notifications</p>
+</h2><p>Create notifications for a user. This request will target a specific
+user entity.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>orgId</strong> (string) One of the organization&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>appId</strong> (string) One of the application&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>userId-3</strong> (string) One of the user&#8217;s identification which includes
+username or UUID. (Specified in path).</li>
+<li><strong>notification</strong> (<a class="reference external" href="#createnotifications">CreateNotifications</a>)
+These parameters are used when forming the notification portion of
+the request. (Specified in body).</li>
+<li><strong>scheduleNotification</strong>
+(<a class="reference external" href="#schedulenotification">ScheduleNotification</a>) To schedule a
+notification for a later time add the deliver parameter with a UNIX
+timestamp to the body of your request. (Specified in body).</li>
+<li><strong>setExpiration</strong> (<a class="reference external" href="#setexpiration">SetExpiration</a>) If a push
+service can&#8217;t deliver a message to a device and needs to resend it
+you can set a notification to expire after a certain date/time.
+(Specified in body).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of created notification&#8217;s info.</li>
+<li>Schema: <a class="reference external" href="#notification">Notification</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+<h2 class="usergrid-GET-heading"><p>GET /{orgId}/{appId}/{receiptId}/*/notifications</p>
+</h2><p>Retrieve notifications associated with one or more receipts through
+providing all the identifications.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>orgId</strong> (string) One of the organization&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>appId</strong> (string) One of the application&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>receiptId</strong> (string) One of the receipt&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of retrieved notification&#8217;s info.</li>
+<li>Schema: <a class="reference external" href="#notification">Notification</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+</div>
+<div class="section" id="organization-methods">
+<h2>Organization Methods<a class="headerlink" href="#organization-methods" title="Permalink to this headline">¶</a></h2>
+<h2 class="usergrid-POST-heading"><p>POST /management/orgs</p>
+</h2><p>Create an organization through a form post.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>CreateOrg</strong> (<a class="reference external" href="#createorg">CreateOrg</a>) A set of organization
+properties supplied through a form. (Specified in body).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of created Organization.</li>
+<li>Schema: <a class="reference external" href="#organization">Organization</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+<h2 class="usergrid-GET-heading"><p>GET /management/orgs/{orgId}</p>
+</h2><p>Retrieve an organization given a specified UUID or username.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>orgId</strong> (string) One of the organization&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of created Organization.</li>
+<li>Schema: <a class="reference external" href="#organization">Organization</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+</div>
+<div class="section" id="permission-methods">
+<h2>Permission Methods<a class="headerlink" href="#permission-methods" title="Permalink to this headline">¶</a></h2>
+<h2 class="usergrid-DELETE-heading"><p>DELETE /{orgId}/{appId}/roles/{roleId}/permissions</p>
+</h2><p>Remove permissions from a role.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>orgId</strong> (string) One of the organization&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>appId</strong> (string) One of the application&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>roleId</strong> (string) One of the role&#8217;s identification which includes
+name or uuid. (Specified in path).</li>
+<li><strong>grant_url_pattern</strong> () The query statement of the url pattern.
+(Specified in query).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of deleted permission&#8217;s info.</li>
+<li>Schema: <a class="reference external" href="#permission">Permission</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+</div>
+<div class="section" id="receipt-methods">
+<h2>Receipt Methods<a class="headerlink" href="#receipt-methods" title="Permalink to this headline">¶</a></h2>
+<h2 class="usergrid-GET-heading"><p>GET /{orgId}/{appId}/receipts</p>
+</h2><p>Retrieve one or more receipts through providing all the identifications.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>orgId</strong> (string) One of the organization&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>appId</strong> (string) One of the application&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of retrieved receipt&#8217;s info.</li>
+<li>Schema: <a class="reference external" href="#receipt">Receipt</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+<h2 class="usergrid-GET-heading"><p>GET /{orgId}/{appId}/{deviceId}/*/receipts</p>
+</h2><p>Retrieve receipts associated with one or more devices through providing
+all the identifications.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>orgId</strong> (string) One of the organization&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>appId</strong> (string) One of the application&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>deviceId</strong> (string) One of the device&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of retrieved receipt&#8217;s info.</li>
+<li>Schema: <a class="reference external" href="#receipt">Receipt</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+<h2 class="usergrid-GET-heading"><p>GET /{orgId}/{appId}/{notificationId}/*/receipts</p>
+</h2><p>Retrieve receipts for one or more notifications through providing all
+the identifications.&#8221;</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>orgId</strong> (string) One of the organization&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>appId</strong> (string) One of the application&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>notificationId</strong> (string) One of the notification&#8217;s identification
+which includes name or uuid. (Specified in path).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of retrieved receipt&#8217;s info.</li>
+<li>Schema: <a class="reference external" href="#receipt">Receipt</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+</div>
+<div class="section" id="role-methods">
+<h2>Role Methods<a class="headerlink" href="#role-methods" title="Permalink to this headline">¶</a></h2>
+<h2 class="usergrid-GET-heading"><p>GET /{orgId}/{appId}/roles</p>
+</h2><p>Retrieve the roles in an application through providing all the
+identifications.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>orgId</strong> (string) One of the organization&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>appId</strong> (string) One of the application&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of retrieved role&#8217;s info.</li>
+<li>Schema: <a class="reference external" href="#role">Role</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+<h2 class="usergrid-POST-heading"><p>POST /{orgId}/{appId}/roles</p>
+</h2><p>Create a new role through providing all the identifications.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>orgId</strong> (string) One of the organization&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>appId</strong> (string) One of the application&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>roleproperty</strong> (<a class="reference external" href="#addrole">AddRole</a>) The required properties of
+the role. (Specified in body).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of created role&#8217;s info.</li>
+<li>Schema: <a class="reference external" href="#role">Role</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+<h2 class="usergrid-DELETE-heading"><p>DELETE /{orgId}/{appId}/roles/{rolename}</p>
+</h2><p>Remove a role through providing all the identifications.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>orgId</strong> (string) One of the organization&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>appId</strong> (string) One of the application&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>rolename</strong> (string) The name of the role. (Specified in path).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of deleted role&#8217;s info.</li>
+<li>Schema: <a class="reference external" href="#role">Role</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+</div>
+<div class="section" id="user-methods">
+<h2>User Methods<a class="headerlink" href="#user-methods" title="Permalink to this headline">¶</a></h2>
+<h2 class="usergrid-GET-heading"><p>GET /management/orgs/{orgId}/users</p>
+</h2><p>Retrieve details about the admin users in an organization.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>orgId</strong> (string) One of the organization&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of retrieved Admin user&#8217;s info.</li>
+<li>Schema: <a class="reference external" href="#user">User</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+<h2 class="usergrid-DELETE-heading"><p>DELETE /management/orgs/{orgId}/users/{userId}</p>
+</h2><p>Remove an admin user from an organization through providing both Id of
+application and organization.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>orgId</strong> (string) One of the organization&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>userId-2</strong> (string) One of the user&#8217;s identification which includes
+username, email address or UUID. (Specified in path).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of deleted Admin user&#8217;s info.</li>
+<li>Schema: <a class="reference external" href="#user">User</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+<h2 class="usergrid-POST-heading"><p>POST /management/users</p>
+</h2><p>Create a whole new admin user.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>adminuserproperty</strong> (<a class="reference external" href="#createadminuser">CreateAdminUser</a>) One or
+more sets of user properties of which username is mandatory and must
+be unique. (Specified in body).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of new created Admin user&#8217;s info.</li>
+<li>Schema: <a class="reference external" href="#user">User</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+<h2 class="usergrid-GET-heading"><p>GET /management/users/{userId}</p>
+</h2><p>Retrieve details about an admin user.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>userId</strong> (string) One of the user&#8217;s identification which includes
+username, real name, email address or UUID. (Specified in path).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of user&#8217;s details</li>
+<li>Schema: <a class="reference external" href="#user">User</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+<h2 class="usergrid-PUT-heading"><p>PUT /management/users/{userId}</p>
+</h2><p>Update the info of an admin user.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>userId</strong> (string) One of the user&#8217;s identification which includes
+username, real name, email address or UUID. (Specified in path).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of user&#8217;s details.</li>
+<li>Schema: <a class="reference external" href="#user">User</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+<h2 class="usergrid-POST-heading"><p>POST /{orgId}/{appId}/groups/{groupId}/users/{userId}</p>
+</h2><p>Add a user to a group through providing all the identifications.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>orgId</strong> (string) One of the organization&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>appId</strong> (string) One of the application&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>groupId</strong> (string) One of the group&#8217;s identification which includes
+name or uuid. (Specified in path).</li>
+<li><strong>userId-3</strong> (string) One of the user&#8217;s identification which includes
+username or UUID. (Specified in path).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of added user&#8217;s info.</li>
+<li>Schema: <a class="reference external" href="#user">User</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+<h2 class="usergrid-DELETE-heading"><p>DELETE /{orgId}/{appId}/groups/{groupId}/users/{userId}</p>
+</h2><p>Delete user from a group through providing all the identifications.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>orgId</strong> (string) One of the organization&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>appId</strong> (string) One of the application&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>groupId</strong> (string) One of the group&#8217;s identification which includes
+name or uuid. (Specified in path).</li>
+<li><strong>userId-3</strong> (string) One of the user&#8217;s identification which includes
+username or UUID. (Specified in path).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of deleted user&#8217;s info.</li>
+<li>Schema: <a class="reference external" href="#user">User</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+<h2 class="usergrid-GET-heading"><p>GET /{orgId}/{appId}/roles/{roleId}/users</p>
+</h2><p>Retrieve the users in a role through providing all the identifications.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>orgId</strong> (string) One of the organization&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>appId</strong> (string) One of the application&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>roleId</strong> (string) One of the role&#8217;s identification which includes
+name or uuid. (Specified in path).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of retrieved user&#8217;s info.</li>
+<li>Schema: <a class="reference external" href="#user">User</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+<h2 class="usergrid-POST-heading"><p>POST /{orgId}/{appId}/roles/{roleId}/users/{userId}</p>
+</h2><p>Add a user to a role through providing all the identifications.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>orgId</strong> (string) One of the organization&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>appId</strong> (string) One of the application&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>roleId</strong> (string) One of the role&#8217;s identification which includes
+name or uuid. (Specified in path).</li>
+<li><strong>userId-3</strong> (string) One of the user&#8217;s identification which includes
+username or UUID. (Specified in path).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of added user&#8217;s info.</li>
+<li>Schema: <a class="reference external" href="#user">User</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+<h2 class="usergrid-DELETE-heading"><p>DELETE /{orgId}/{appId}/roles/{roleId}/users/{userId}</p>
+</h2><p>Remove a user from a role through providing all the identifications.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>orgId</strong> (string) One of the organization&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>appId</strong> (string) One of the application&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>roleId</strong> (string) One of the role&#8217;s identification which includes
+name or uuid. (Specified in path).</li>
+<li><strong>userId-3</strong> (string) One of the user&#8217;s identification which includes
+username or UUID. (Specified in path).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of deleted user&#8217;s info.</li>
+<li>Schema: <a class="reference external" href="#user">User</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+<h2 class="usergrid-GET-heading"><p>GET /{orgId}/{appId}/users</p>
+</h2><p>Retrieve users though query statement.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>orgId</strong> (string) One of the organization&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>appId</strong> (string) One of the application&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>queryStatement</strong> () The query statement of the User. (Specified in
+query).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of retrieved user&#8217;s info.</li>
+<li>Schema: <a class="reference external" href="#user">User</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+<h2 class="usergrid-POST-heading"><p>POST /{orgId}/{appId}/users</p>
+</h2><p>Create a user in the users collection through providing all the
+identifications.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>orgId</strong> (string) One of the organization&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>appId</strong> (string) One of the application&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>CreateUser</strong> (<a class="reference external" href="#createuser">CreateUser</a>) The properties of the
+user. (Specified in body).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of created user&#8217;s info.</li>
+<li>Schema: <a class="reference external" href="#user">User</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+<h2 class="usergrid-GET-heading"><p>GET /{orgId}/{appId}/users/{userId}</p>
+</h2><p>Retrieve a user through providing all the identifications.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>orgId</strong> (string) One of the organization&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>appId</strong> (string) One of the application&#8217;s identification which
+includes name or uuid. (Specified in path).</li>
+<li><strong>userId-2</strong> (string) One of the user&#8217;s identification which includes
+username, email address or UUID. (Specified in path).</li>
+</ul>
+<h3><p>Responses</p>
+</h3><p><strong>200</strong></p>
+<ul class="simple">
+<li>Description: An array of retrieved user&#8217;s info.</li>
+<li>Schema: <a class="reference external" href="#user">User</a></li>
+</ul>
+<p><strong>default</strong></p>
+<ul class="simple">
+<li>Description: Unexpected error.</li>
+<li>Schema: <a class="reference external" href="#error">Error</a></li>
+</ul>
+<h2 class="usergrid-PUT-heading"><p>PUT /{orgId}/{appId}/users/{userId}</p>
+</h2><p>Update a user through providing all the identifications.</p>
+<h3><p>Parameters</p>
+</h3><ul class="simple">
+<li><strong>orgId</strong> (string) One of the organization&#8217;s identification which
+includes name o

<TRUNCATED>

[33/60] [abbrv] incubator-usergrid git commit: cherry picking docs from master

[sn...@apache.org]

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/user-management/messagee-example.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/user-management/messagee-example.txt b/content/docs/_sources/user-management/messagee-example.txt
new file mode 100644
index 0000000..eb3e560
--- /dev/null
+++ b/content/docs/_sources/user-management/messagee-example.txt
@@ -0,0 +1,137 @@
+# App Example - Messagee
+
+Messagee is a simple Twitter-style messaging application that leverages the extensive functionality of Usergrid. This section describes some of the features of Messagee.
+
+There are three client versions of Messagee:
+
+* [An iOS client version](https://github.com/apigee/usergrid-sample-ios-messagee)
+* [An Android client version](https://github.com/apigee/usergrid-sample-android-messagee)
+* [An HTML5 client](https://github.com/apigee/usergrid-sample-html5-messagee)
+
+The sections below describe how to create a new app, enter some test users, and run the app. You also learn how to use the Usergrid admin portal, a user interface that streamlines data and application management in the Usergrid system. The portal is also a reference application that shows how to incorporate Usergrid APIs with JavaScript. For a more detailed discussion of the portal's functionality, see Admin portal.
+
+## Creating a user account in Usergrid
+
+Go to the Usergrid portal and login. If you are new to Usergrid, sign up for an account, specifying an organization (e.g., the name of your company or project team) and a username and password that you can use to authenticate. Because Usergrid are designed for use by development teams, the same username can be associated with one or more organizations.
+
+If you create a new account, you receive a confirmation email that contains a URL that you must click to activate the account. After this, simply log in to the portal with your username and password.
+
+.. image:: login.png
+
+## Creating an app and users
+
+When you have logged in, you need to create a new application.
+
+.. image:: portal1.png
+
+### STEP 1
+
+Enter a unique application name. The name must be unique to avoid a conflict with another user running the same application.
+
+.. image:: portal2.png
+
+### STEP 2 
+
+Make sure that the portal shows the application name you entered as the active application beneath the Applications menu (1).
+
+If the correct name is not displayed, click the menu and select your application. Next, you need to populate a test user user-test-1 that is going to log in to your copy of the server-side Messagee app.
+
+### STEP 3
+
+Click the Users box on the left side of the console (2).
+
+.. image:: portal3.png
+
+### STEP 4
+
+Click the Add button and enter the user information for your application in the pop-up window (be sure to create a password you can remember), and then click the Create button. Repeat these steps to create a second username test-user-2.
+
+.. image:: portal4.png
+
+### STEP 5
+
+When you have finished all these steps, you have a new application and two new users.
+
+.. image:: portal5.png
+
+Now that you have created a uniquely named copy of the Messagee application as well as two user accounts (test-user-1 and test-user-2), you are ready to test out the Messagee app. Use test-user-1 to log in to the app, and test-user-2 as the user to follow.
+
+To continue with the example, follow the instructions for a client app (iOS client, Android client, or HTML5 client).
+
+## iOS client
+
+Messagee is available as an iPhone app that uses Usergrid and RestKit. The source for the iOS version of Messagee is available in the /samples/messagee directory of the Usergrid iOS SDK
+
+Here are the steps to run the Messagee app on iOS:
+
+### STEP 6
+
+Run Steps 1-5 under Creating an app and users. These steps create a unique instance of the Messagee app on the server and two test users, test-user-1 and test-user-2.
+
+### STEP 7
+
+Access the Messagee server app by typing a URL similar to the following into your iOS mobile client (replace <Messagee> with the unique name of your application):
+https://api.usergrid.com/<Messagee>/index.html
+
+.. image:: iOS1chooseapp.jpg
+
+### STEP 8
+
+On the mobile client, complete the registration information and click Register.
+
+.. image:: iOS2register.jpg
+
+### STEP 9
+
+Log in to the Messagee app by entering the test-user-1 account information created previously, and click the Sign in button.
+
+.. image:: iOS3signin.jpg
+
+### STEP 10 
+
+At this point, the message board is empty:
+
+.. image:: iOS5emptyfeed.jpg
+
+### STEP 11 
+
+To post a message using the app, click the top-right icon in the message board to create a message, write the message text, and send it by clicking Post.
+
+.. image:: iOS6newmsg.jpg
+
+Note: The posted message should appear in the message board within few seconds.
+
+.. image:: iOS7feed1msg.jpg
+
+### STEP 12 
+
+For your instance of the Messagee application to act like Twitter, you need to "follow" another user.
+
+In the message board, click Add People and add test-user-2 as a person that test-user-1 follows.
+
+.. image:: iOS9followme.jpg
+
+### STEP 6
+
+Log in as test-user-2 and post a message as this user to the message board.
+
+Go back and log in as user test-user-1.
+Because test-user-1 follows test-user-2, you should see the message sent by test-user-2 in the message board.
+
+.. image:: iOS10seeusermsg.jpg
+
+## iOS SDK
+
+If you want to write iOS applications that connect to Usergrid, [download the Usergrid iOS SDK](https://github.com/apache/incubator-usergrid/tree/master/sdks/ios).
+
+__Note__: The Messagee iOS application uses RestKit, a popular REST framework for iOS, to communicate with Usergrid. Because Usergrid use a REST API, you can use any REST framework to talk with the service. However, the official Usergrid iOS SDK provides a more convenient communication mechanism that you should use unless you're already using RestKit or some other framework in your project.
+
+## Android client and SDK
+Messagee is available as a sample Android app that acts as a Usergrid client. The source for the Android version is packaged with the Usergrid Android SDK in the /samples/messagee directory.
+
+[Download the Usergrid Android SDK](https://github.com/apache/incubator-usergrid/tree/master/sdks/android)
+
+## Javascript/HTML5 client and SDK
+Messagee is also available as a sample HTML5 app that behaves in much the same way as the two previous examples. The source for the HTML5 version is packaged with the Usergrid Javascript/HTML5 SDK in the /samples/messagee directory.
+
+[Download the Usergrid Javascript/HTML5 SDK](https://github.com/apache/incubator-usergrid/tree/master/sdks/html5-javascript)

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/user-management/user-connections.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/user-management/user-connections.txt b/content/docs/_sources/user-management/user-connections.txt
new file mode 100644
index 0000000..a386d2a
--- /dev/null
+++ b/content/docs/_sources/user-management/user-connections.txt
@@ -0,0 +1,40 @@
+# Social Graph Connections
+
+One of the most useful features of Usergrid is the ability to create connections between entities, which allow you to model arbitrary relationships between entities. This feature is particularly powerful when applied to user entities by allowing you to model complex social graphs between users as well as groups of users.
+
+## Following/followers
+To make the social graph possibilities of entity connections even easier to achieve, Usergrid also has special support for a default following/followers relationship, which offers these additional features:
+
+Reciprocal connection: If a following connection is made between a user and another user, a reciprocal followers relationship will be created automatically. In contrast, all of other entity connections are one-way, meaning any reciprocal relationship must be created manually.
+
+Activity feed subscription: The followed user's activities will automatically be posted to the following user's activity feed. For example, if Arthur is following Ford, then any activities published by Ford that Arthur is allowed to see will appear in Arthur's activity feed.
+
+## Creating a following/followers connection
+To create a following/followers connection between two entities, create the connection as you would any generic entity connection. For full details on creating connections, see [Connecting entities](../entity-connections/connecting-entities.html). 
+
+For example, the following request would create a following/followers relationship between two user entities with the usernames 'Fred' and 'Barney':
+
+    POST https://api.usergrid.com/your-org/your-app/users/barney/following/users/fred
+
+<div class="admonition note"> <p class="first admonition-title">Note</p> <p class="last">
+Please note that this only works when you ``POST`` a ``following`` connection. Creating a follower connection would not create a reciprocal following connection.
+</p></div>
+
+This would retrieve a list of the users that Barney is following:
+
+    GET https://api.usergrid.com/your-org/your-app/users/barney/following
+    
+And this would retrieve a list of users that are following Fred:
+
+    GET https://api.usergrid.com/your-org/your-app/users/fred/followers
+    
+# Creating other connections
+You can extend this connection structure to create connections using any relationship. For example, you could use likes to denote a connection between a user and his dog with this POST:
+
+    POST https://api.usergrid.com/your-org/your-app/users/Fred/likes/dogs/Dino
+    
+Note that in this case a reciprocal connection is not automatically created. To do so you would need to manually create the reciprocal connection with another POST such as:
+
+    POST https://api.usergrid.com/your-org/your-app/dogs/Dino/liked_by/users/Fred
+    
+For more information on using entity connections, see [Connecting entities](../entity-connections/connecting-entities.html).

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/user-management/user-management.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/user-management/user-management.txt b/content/docs/_sources/user-management/user-management.txt
new file mode 100644
index 0000000..7f9e1d6
--- /dev/null
+++ b/content/docs/_sources/user-management/user-management.txt
@@ -0,0 +1,42 @@
+# User management & social graph
+Whether you're developing apps for mobile or the Web, it's almost certain that you will need to be able to handle user management, as well as offer the types of social features users have come to expect from a rich app experience. Usergrid makes all of this easy with default entity types and functionality available right out of the box. From user registration and profiles to login and authentication to activity feeds and social graph, you can create a social experience quickly and easily with just a few types of API calls.
+
+## User management
+The default user entity in Usergrid is designed to model app users, meaning registering users and managing their profiles is as simple as sending and updating JSON via the API. Used in conjunction with our available social graph, as well as our OAuth 2.0 authentication and token authorization features, you have all the tools you need to manage your user base.
+
+Learn more about:
+
+* [User management](user-management.html)
+* [Authentication & tokens](../security-and-auth/app-security.html)
+* [Permissions and roles](../security-and-auth/using-permissions.html)
+
+## Group management
+One of the most basic social features of any app is the ability to create groups of users to limit shared access to user or other app data. The default group entity in Usergrid was designed for this exact purpose. Associate a user with as many groups or sub-groups as you need, then apply permissions or roles to define shared access to Usergrid data.
+
+Learn more about:
+
+* [Group management](group.md)
+* [Permissions and roles](../security-and-auth/using-permissions.html)
+
+## Social connections
+To create a rich social graph, your app needs to be able to create connections between users. Usergrid makes this process lightweight by allowing you to create social connections and generic entity connections between users to model relationships by working with simple URI paths.
+
+For example, you could create a 'likes' relationship between two users with a POST:
+
+    https://api.usergrid.com/your-org/your-app/users/Arthur/likes/users/Ford
+    
+You could then retrieve all the users Arthur 'likes' with a GET to populate a list in your UI:
+
+    https://api.usergrid.com/your-org/your-app/users/Arthur/likes
+    
+Learn more about:
+
+* [Social connections](user-connections.html)
+* [Generic entity connections](../data-storage/relationship.html)
+
+## Activity feeds
+Activity feeds can be an essential way of establishing a social dimension of your user experience. Allow users to actively publish activities, such as status messages, or have your application code passively publish activities based on user actions, such as posting a photo. Activity feeds can be created and shared at both the user and group level, giving you the flexibility to present activity feeds that are most relevant to your users.
+
+Learn more about:
+
+* [Activity feeds]

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/user-management/working-user-data.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/user-management/working-user-data.txt b/content/docs/_sources/user-management/working-user-data.txt
new file mode 100644
index 0000000..a7603fd
--- /dev/null
+++ b/content/docs/_sources/user-management/working-user-data.txt
@@ -0,0 +1,278 @@
+# Working with User Data
+You can store and manage user data as User entities. With user data in your application, you can add support for a wide variety of features common to mobile apps. For example, you can:
+
+* Control access to data by defining permission rules. (See Security & token authentication for more.)
+* Present content specific to each user, such as their list of favorites.
+* Support social features, such as letting users "follow" one another, for example.
+
+In mobile applications, data about users is typically added by users themselves when they register through your app. The topics in this section provide specific cURL and SDK-specific examples for getting things done with user data.
+
+## Creating users
+
+A user entity represents an application user. Using API Services you can create, retrieve, update, delete, and query user entities. See User entity properties for a list of the system-defined  properties for user entities. In addition, you can create user properties specific to your application.
+
+### Request Syntax
+
+    curl -X POST "https://api.usergrid.com/your-org/your-app/users" -d '{ "username": "john.doe", "email": "john.doe@gmail.com", "name": "John Doe", "password": "test1234" }'
+  
+Use the POST method to create a new user in the users collection.
+
+### Request URI
+
+    POST /<org_id>/<app_id>/users
+
+Parameters
+
+Parameter	    Description
+---------       -----------
+uuid | org_id	Organization UUID or organization name.
+uuid | app_id	Application UUID or application name.
+request body	One or more sets of user properties.
+
+The username is mandatory and must be unique. Here's an example:
+
+    {
+        "username" : "john.doe",
+        "email" : "john.doe@gmail.com",
+        "name" : "John Doe",
+        "password" : "test1234"
+    }
+
+Although the password parameter is not mandatory, if you don't specify it, the user will not be able to log in using username and password credentials. If a password is not specified for the user, and you're an Admin, you can set a password for the user (see Setting a password).
+
+__ Note__: The username can contain any combination of characters, including those that represent letters, numbers, and symbols.
+
+### Example
+
+__Note__: Although not shown in the API examples below, you need to provide a valid access token with each API call. See Authenticating users and application clients for details.
+
+### Request
+
+    curl -X POST "https://api.usergrid.com/my-org/my-app/users" -d '{"username":"john.doe","email":"john.doe@gmail.com","name":"John Doe"}'
+    
+### Response
+
+    {
+      "action" : "post",
+      "application" : "db1e60a0-417f-11e3-9586-0f1ff3650d20",
+      "params" : { },
+      "path" : "/users",
+      "uri" : "https://api.usergrid.com/steventraut/mynewapp/users",
+      "entities" : [ {
+        "uuid" : "8ae8a6ea-84a5-11e3-884d-f18e8f6fb3bc",
+        "type" : "user",
+        "name" : "John Doe",
+        "created" : 1390533228622,
+        "modified" : 1390533228622,
+        "username" : "john.doe",
+        "email" : "john.doe@gmail.com",
+        "activated" : true,
+        "picture" : "http://www.gravatar.com/avatar/e13743a7f1db7f4246badd6fd6ff54ff",
+        "metadata" : {
+          "path" : "/users/8ae8a6ea-84a5-11e3-884d-f18e8f6fb3bc",
+          "sets" : {
+            "rolenames" : "/users/8ae8a6ea-84a5-11e3-884d-f18e8f6fb3bc/roles",
+            "permissions" : "/users/8ae8a6ea-84a5-11e3-884d-f18e8f6fb3bc/permissions"
+          },
+          "collections" : {
+            "activities" : "/users/8ae8a6ea-84a5-11e3-884d-f18e8f6fb3bc/activities",
+            "devices" : "/users/8ae8a6ea-84a5-11e3-884d-f18e8f6fb3bc/devices",
+            "feed" : "/users/8ae8a6ea-84a5-11e3-884d-f18e8f6fb3bc/feed",
+            "groups" : "/users/8ae8a6ea-84a5-11e3-884d-f18e8f6fb3bc/groups",
+            "roles" : "/users/8ae8a6ea-84a5-11e3-884d-f18e8f6fb3bc/roles",
+            "following" : "/users/8ae8a6ea-84a5-11e3-884d-f18e8f6fb3bc/following",
+            "followers" : "/users/8ae8a6ea-84a5-11e3-884d-f18e8f6fb3bc/followers"
+          }
+        }
+      }],
+      "timestamp" : 1390533228619,
+      "duration" : 142,
+      "organization" : "my-org",
+      "applicationName" : "my-app"
+    }
+
+
+## Retrieving user data
+
+You can retrieve data about users through cURL or one of the SDKs. Each provides a way to filter the list of users by data associated with the user, such as username or UUID, or other properties in the user entity.
+
+See User entity properties for a list of the system-defined  properties for user entities. In addition, you can create user properties specific to your application.
+
+### Request Syntax
+
+    curl -X GET "https://api.usergrid.com/your-org/your-app/users"
+    
+Use the GET method to retrieve user data.
+
+### Request URI
+
+    GET /<org_id>/<app_id>/users/<uuid | username | email_address | ?ql=query_string>
+    
+Parameters
+
+Parameter	    Description
+---------       -----------
+uuid | org_id	Organization UUID or organization name
+uuid | app_id	Application UUID or application name
+user identifier User UUID, username, or email address. 
+
+The alias ``/users/me`` can be used in place of the current user’s uuid, username, or email address. Note: The ``/users/me`` endpoint is accessible only if you provide an access token with the request (see Authenticating users and application clients). If you make an anonymous ("guest") call, the system will not be able to determine which user to return as /users/me.
+
+__Note__: The username can contain any combination of characters, including those that represent letters, numbers, and symbols.
+
+### Example
+
+__Note__: Although not shown in the API examples below, you need to provide a valid access token with each API call. See [Authenticating users and application clients](../security-and-auth/authenticating-users-and-application-clients.html) for details.
+
+Requests
+
+    # Get a user by username.
+    curl -X GET "https://api.usergrid.com/my-org/my-app/users/jane.doe"
+
+    # Get a user by UUID.
+    curl -X GET "https://api.usergrid.com/my-org/my-app/users/a407b1e7-58e8-11e1-ac46-22000a1c5a67e"
+
+    # Get a user by email.
+    curl -X GET "https://api.usergrid.com/my-org/my-app/users/jane.doe@gmail.com"
+
+    # Get user data filtering by their city property value.
+    curl -X GET "https://api.usergrid.com/my-org/my-app/users?ql=select%20*%20where%20adr.city%3D'Chicago'"
+
+Response
+
+    {
+        "action" : "get",
+        "application" : "1c8f60e4-da67-11e0-b93d-12313f0204bb8",
+        "params" : {
+            "_": [
+                "1315524419746"
+            ]
+        },
+        "path" : "https://api.usergrid.com/12313f0204bb-1c8f60e4-da67-11e0-b93d/1c8f60e4-da67-11e0-b93d-12313f0204bb/users",
+        "uri" : "https://api.usergrid.com/005056c00008-4353136f-e978-11e0-8264/4353136f-e978-11e0-8264-005056c00008/users",
+        "entities" : [ {
+            "uuid" : "78c54a82-da71-11e0-b93d-12313f0204b",
+            "type" : "user",
+            "created" : 1315524171347008,
+            "modified" : 1315524171347008,
+            "activated" : true,
+            "email" : "jane.doe@gmail.com",
+            "metadata" : {
+                "path" : "/users/78c54a82-da71-11e0-b93d-12313f0204bb",
+                "sets" : {
+                    "rolenames" : "/users/78c54a82-da71-11e0-b93d-12313f0204bb/rolenames",
+                    "permissions" : "/users/78c54a82-da71-11e0-b93d-12313f0204bb/permissions"
+                },
+                "collections" : {
+                    "activities" : "/users/78c54a82-da71-11e0-b93d-12313f0204bb/activities",
+                    "devices" : "/users/78c54a82-da71-11e0-b93d-12313f0204bb/devices",
+                    "feed" : "/users/78c54a82-da71-11e0-b93d-12313f0204bb/feed",
+                    "groups" : "/users/78c54a82-da71-11e0-b93d-12313f0204bb/groups",
+                    "roles" : "/users/78c54a82-da71-11e0-b93d-12313f0204bb/roles",
+                    "following" : "/users/78c54a82-da71-11e0-b93d-12313f0204bb/following",
+                    "followers" : "/users/78c54a82-da71-11e0-b93d-12313f0204bb/followers"
+                }
+            },
+            "username" : "jane.doe"
+        }
+        ... Additional entities here if data for multiple users was returned...
+        ],
+        "timestamp" : 1315524421071,
+        "duration" : 107,
+        "organization" : "my-org",
+        "applicationName": "my-app"
+    }
+
+## Updating & deleting user data
+
+To update or delete a user, perform an update or delete on the associated user entity as you would any other entity. For more information and code samples, see [Updating Data Entities](../data-storage/entities.html#updating-data-entities) and [Deleting Data Entities](../data-storage/entities.html#deleting-data-entities).
+
+## Changing a user password
+
+Changing a user's password
+
+### Request syntax
+
+    curl -X PUT https://api.usergrid.com/<org>/<app>/users/<username_or_email>/password -d '{oldpassword:<old_password>,newpassword:<new_password>}'
+    
+Parameters
+
+Parameter	        Description
+---------           -----------
+org	                Organization UUID or organization name
+app	                Application UUID or application name
+username_or_email	Username or email of the user entity whose password you want to reset.
+old_password	    User entity's old password.
+new_password	    User entity's new password.
+
+__Note__: If your request is authenticated with an application-level token, then ``old_password`` is not required. For more, see [Application client authentication](../security-and-auth/authenticating-users-and-application-clients.html#application-client-authentication).
+
+Example request
+
+    curl -X PUT https://api.usergrid.com/my-org/my-app/users/john.doe/password -d '{"newpassword":"foo9876a","oldpassword":"bar1234b"}'
+    
+Example response
+
+    {
+      "action": "set user password",
+      "timestamp": 1355185897894,
+      "duration": 47
+    }
+    
+## Resetting a user password
+
+Resetting a user's password
+
+Usergrid provides a standard password reset flow that can be implemented to allow a user to reset their password without having to provide their old password. The most common use of this would be a 'Forgot password?' feature in your app.
+
+Note that you can also implement your own password reset flow using application-level authentication and the /password endpoint. For more, see [Changing a user password](#changing-a-user-password).
+
+To use the Usergrid password reset flow, do the following:
+
+### STEP 1: Get the password reset request form.
+
+Make a GET request to the following:
+
+    /users/<username>/resetpw
+    
+For example, using cURL, a request to reset the password for a user with username 'someUser' would look like this:
+
+    curl -x GET https://api.usergrid.com/your-org/your-app/users/someUser/resetpw
+    
+### STEP 2: Display the returned password reset request form to the user.
+
+The request to ``/resetpw`` will return the HTML for the standard Usergrid password reset request form that you will display to your user. The request form requires the users to provide their username as well as answer a standard CAPTCHA challenge:
+
+    <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+    <html>
+    <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+    <title>Reset Password</title>
+    <link rel="stylesheet" type="text/css" href="/css/styles.css" />
+    </head>
+    <body>
+        <div class="dialog-area">
+            
+            <form class="dialog-form" action="" method="post">
+                <fieldset>
+                    <p>
+                        Enter the captcha to have your password reset instructions sent to
+                        someUser@adomain.com
+                    </p>
+                    <p id="human-proof"></p>
+                    <script type="text/javascript" src="https://www.google.com/recaptcha/api/challenge?k=6LdSTNESAAAAAKHdVglHmMu86_EoYxsJjqQD1IpZ"></script>
+
+                    <p class="buttons">
+                        <input type="submit" value="submit" />
+                    </p>
+                </fieldset>
+            </form>
+        </div>
+    </body>
+    </html>
+		
+You can apply any additional styling you wish to the form to make it match the style of your app before displaying it to the user.
+
+### STEP 3: Let Usergrid handle the rest!
+
+Once the user submits the form with their username, they will receive an email from Usergrid that contains a link to the password reset form, where they can specify a new password. The user entity will be updated immediately.

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_static/ajax-loader.gif
----------------------------------------------------------------------
diff --git a/content/docs/_static/ajax-loader.gif b/content/docs/_static/ajax-loader.gif
new file mode 100644
index 0000000..61faf8c
Binary files /dev/null and b/content/docs/_static/ajax-loader.gif differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_static/basic.css
----------------------------------------------------------------------
diff --git a/content/docs/_static/basic.css b/content/docs/_static/basic.css
new file mode 100644
index 0000000..9fa77d8
--- /dev/null
+++ b/content/docs/_static/basic.css
@@ -0,0 +1,599 @@
+/*
+ * basic.css
+ * ~~~~~~~~~
+ *
+ * Sphinx stylesheet -- basic theme.
+ *
+ * :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+ * :license: BSD, see LICENSE for details.
+ *
+ */
+
+/* -- main layout ----------------------------------------------------------- */
+
+div.clearer {
+    clear: both;
+}
+
+/* -- relbar ---------------------------------------------------------------- */
+
+div.related {
+    width: 100%;
+    font-size: 90%;
+}
+
+div.related h3 {
+    display: none;
+}
+
+div.related ul {
+    margin: 0;
+    padding: 0 0 0 10px;
+    list-style: none;
+}
+
+div.related li {
+    display: inline;
+}
+
+div.related li.right {
+    float: right;
+    margin-right: 5px;
+}
+
+/* -- sidebar --------------------------------------------------------------- */
+
+div.sphinxsidebarwrapper {
+    padding: 10px 5px 0 10px;
+}
+
+div.sphinxsidebar {
+    float: left;
+    width: 230px;
+    margin-left: -100%;
+    font-size: 90%;
+}
+
+div.sphinxsidebar ul {
+    list-style: none;
+}
+
+div.sphinxsidebar ul ul,
+div.sphinxsidebar ul.want-points {
+    margin-left: 20px;
+    list-style: square;
+}
+
+div.sphinxsidebar ul ul {
+    margin-top: 0;
+    margin-bottom: 0;
+}
+
+div.sphinxsidebar form {
+    margin-top: 10px;
+}
+
+div.sphinxsidebar input {
+    border: 1px solid #98dbcc;
+    font-family: sans-serif;
+    font-size: 1em;
+}
+
+div.sphinxsidebar #searchbox input[type="text"] {
+    width: 170px;
+}
+
+div.sphinxsidebar #searchbox input[type="submit"] {
+    width: 30px;
+}
+
+img {
+    border: 0;
+    max-width: 100%;
+}
+
+/* -- search page ----------------------------------------------------------- */
+
+ul.search {
+    margin: 10px 0 0 20px;
+    padding: 0;
+}
+
+ul.search li {
+    padding: 5px 0 5px 20px;
+    background-image: url(file.png);
+    background-repeat: no-repeat;
+    background-position: 0 7px;
+}
+
+ul.search li a {
+    font-weight: bold;
+}
+
+ul.search li div.context {
+    color: #888;
+    margin: 2px 0 0 30px;
+    text-align: left;
+}
+
+ul.keywordmatches li.goodmatch a {
+    font-weight: bold;
+}
+
+/* -- index page ------------------------------------------------------------ */
+
+table.contentstable {
+    width: 90%;
+}
+
+table.contentstable p.biglink {
+    line-height: 150%;
+}
+
+a.biglink {
+    font-size: 1.3em;
+}
+
+span.linkdescr {
+    font-style: italic;
+    padding-top: 5px;
+    font-size: 90%;
+}
+
+/* -- general index --------------------------------------------------------- */
+
+table.indextable {
+    width: 100%;
+}
+
+table.indextable td {
+    text-align: left;
+    vertical-align: top;
+}
+
+table.indextable dl, table.indextable dd {
+    margin-top: 0;
+    margin-bottom: 0;
+}
+
+table.indextable tr.pcap {
+    height: 10px;
+}
+
+table.indextable tr.cap {
+    margin-top: 10px;
+    background-color: #f2f2f2;
+}
+
+img.toggler {
+    margin-right: 3px;
+    margin-top: 3px;
+    cursor: pointer;
+}
+
+div.modindex-jumpbox {
+    border-top: 1px solid #ddd;
+    border-bottom: 1px solid #ddd;
+    margin: 1em 0 1em 0;
+    padding: 0.4em;
+}
+
+div.genindex-jumpbox {
+    border-top: 1px solid #ddd;
+    border-bottom: 1px solid #ddd;
+    margin: 1em 0 1em 0;
+    padding: 0.4em;
+}
+
+/* -- general body styles --------------------------------------------------- */
+
+a.headerlink {
+    visibility: hidden;
+}
+
+h1:hover > a.headerlink,
+h2:hover > a.headerlink,
+h3:hover > a.headerlink,
+h4:hover > a.headerlink,
+h5:hover > a.headerlink,
+h6:hover > a.headerlink,
+dt:hover > a.headerlink,
+caption:hover > a.headerlink,
+p.caption:hover > a.headerlink,
+div.code-block-caption:hover > a.headerlink {
+    visibility: visible;
+}
+
+div.body p.caption {
+    text-align: inherit;
+}
+
+div.body td {
+    text-align: left;
+}
+
+.field-list ul {
+    padding-left: 1em;
+}
+
+.first {
+    margin-top: 0 !important;
+}
+
+p.rubric {
+    margin-top: 30px;
+    font-weight: bold;
+}
+
+img.align-left, .figure.align-left, object.align-left {
+    clear: left;
+    float: left;
+    margin-right: 1em;
+}
+
+img.align-right, .figure.align-right, object.align-right {
+    clear: right;
+    float: right;
+    margin-left: 1em;
+}
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+    text-align: left;
+}
+
+.align-center {
+    text-align: center;
+}
+
+.align-right {
+    text-align: right;
+}
+
+/* -- sidebars -------------------------------------------------------------- */
+
+div.sidebar {
+    margin: 0 0 0.5em 1em;
+    border: 1px solid #ddb;
+    padding: 7px 7px 0 7px;
+    background-color: #ffe;
+    width: 40%;
+    float: right;
+}
+
+p.sidebar-title {
+    font-weight: bold;
+}
+
+/* -- topics ---------------------------------------------------------------- */
+
+div.topic {
+    border: 1px solid #ccc;
+    padding: 7px 7px 0 7px;
+    margin: 10px 0 10px 0;
+}
+
+p.topic-title {
+    font-size: 1.1em;
+    font-weight: bold;
+    margin-top: 10px;
+}
+
+/* -- admonitions ----------------------------------------------------------- */
+
+div.admonition {
+    margin-top: 10px;
+    margin-bottom: 10px;
+    padding: 7px;
+}
+
+div.admonition dt {
+    font-weight: bold;
+}
+
+div.admonition dl {
+    margin-bottom: 0;
+}
+
+p.admonition-title {
+    margin: 0px 10px 5px 0px;
+    font-weight: bold;
+}
+
+div.body p.centered {
+    text-align: center;
+    margin-top: 25px;
+}
+
+/* -- tables ---------------------------------------------------------------- */
+
+table.docutils {
+    border: 0;
+    border-collapse: collapse;
+}
+
+table caption span.caption-number {
+    font-style: italic;
+}
+
+table caption span.caption-text {
+}
+
+table.docutils td, table.docutils th {
+    padding: 1px 8px 1px 5px;
+    border-top: 0;
+    border-left: 0;
+    border-right: 0;
+    border-bottom: 1px solid #aaa;
+}
+
+table.field-list td, table.field-list th {
+    border: 0 !important;
+}
+
+table.footnote td, table.footnote th {
+    border: 0 !important;
+}
+
+th {
+    text-align: left;
+    padding-right: 5px;
+}
+
+table.citation {
+    border-left: solid 1px gray;
+    margin-left: 1px;
+}
+
+table.citation td {
+    border-bottom: none;
+}
+
+/* -- figures --------------------------------------------------------------- */
+
+div.figure {
+    margin: 0.5em;
+    padding: 0.5em;
+}
+
+div.figure p.caption {
+    padding: 0.3em;
+}
+
+div.figure p.caption span.caption-number {
+    font-style: italic;
+}
+
+div.figure p.caption span.caption-text {
+}
+
+
+/* -- other body styles ----------------------------------------------------- */
+
+ol.arabic {
+    list-style: decimal;
+}
+
+ol.loweralpha {
+    list-style: lower-alpha;
+}
+
+ol.upperalpha {
+    list-style: upper-alpha;
+}
+
+ol.lowerroman {
+    list-style: lower-roman;
+}
+
+ol.upperroman {
+    list-style: upper-roman;
+}
+
+dl {
+    margin-bottom: 15px;
+}
+
+dd p {
+    margin-top: 0px;
+}
+
+dd ul, dd table {
+    margin-bottom: 10px;
+}
+
+dd {
+    margin-top: 3px;
+    margin-bottom: 10px;
+    margin-left: 30px;
+}
+
+dt:target, .highlighted {
+    background-color: #fbe54e;
+}
+
+dl.glossary dt {
+    font-weight: bold;
+    font-size: 1.1em;
+}
+
+.field-list ul {
+    margin: 0;
+    padding-left: 1em;
+}
+
+.field-list p {
+    margin: 0;
+}
+
+.optional {
+    font-size: 1.3em;
+}
+
+.sig-paren {
+    font-size: larger;
+}
+
+.versionmodified {
+    font-style: italic;
+}
+
+.system-message {
+    background-color: #fda;
+    padding: 5px;
+    border: 3px solid red;
+}
+
+.footnote:target  {
+    background-color: #ffa;
+}
+
+.line-block {
+    display: block;
+    margin-top: 1em;
+    margin-bottom: 1em;
+}
+
+.line-block .line-block {
+    margin-top: 0;
+    margin-bottom: 0;
+    margin-left: 1.5em;
+}
+
+.guilabel, .menuselection {
+    font-family: sans-serif;
+}
+
+.accelerator {
+    text-decoration: underline;
+}
+
+.classifier {
+    font-style: oblique;
+}
+
+abbr, acronym {
+    border-bottom: dotted 1px;
+    cursor: help;
+}
+
+/* -- code displays --------------------------------------------------------- */
+
+pre {
+    overflow: auto;
+    overflow-y: hidden;  /* fixes display issues on Chrome browsers */
+}
+
+td.linenos pre {
+    padding: 5px 0px;
+    border: 0;
+    background-color: transparent;
+    color: #aaa;
+}
+
+table.highlighttable {
+    margin-left: 0.5em;
+}
+
+table.highlighttable td {
+    padding: 0 0.5em 0 0.5em;
+}
+
+div.code-block-caption {
+    padding: 2px 5px;
+    font-size: small;
+}
+
+div.code-block-caption code {
+    background-color: transparent;
+}
+
+div.code-block-caption + div > div.highlight > pre {
+    margin-top: 0;
+}
+
+div.code-block-caption span.caption-number {
+    padding: 0.1em 0.3em;
+    font-style: italic;
+}
+
+div.code-block-caption span.caption-text {
+}
+
+div.literal-block-wrapper {
+    padding: 1em 1em 0;
+}
+
+div.literal-block-wrapper div.highlight {
+    margin: 0;
+}
+
+code.descname {
+    background-color: transparent;
+    font-weight: bold;
+    font-size: 1.2em;
+}
+
+code.descclassname {
+    background-color: transparent;
+}
+
+code.xref, a code {
+    background-color: transparent;
+    font-weight: bold;
+}
+
+h1 code, h2 code, h3 code, h4 code, h5 code, h6 code {
+    background-color: transparent;
+}
+
+.viewcode-link {
+    float: right;
+}
+
+.viewcode-back {
+    float: right;
+    font-family: sans-serif;
+}
+
+div.viewcode-block:target {
+    margin: -1px -10px;
+    padding: 0 10px;
+}
+
+/* -- math display ---------------------------------------------------------- */
+
+img.math {
+    vertical-align: middle;
+}
+
+div.body div.math p {
+    text-align: center;
+}
+
+span.eqno {
+    float: right;
+}
+
+/* -- printout stylesheet --------------------------------------------------- */
+
+@media print {
+    div.document,
+    div.documentwrapper,
+    div.bodywrapper {
+        margin: 0 !important;
+        width: 100%;
+    }
+
+    div.sphinxsidebar,
+    div.related,
+    div.footer,
+    #top-link {
+        display: none;
+    }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_static/comment-bright.png
----------------------------------------------------------------------
diff --git a/content/docs/_static/comment-bright.png b/content/docs/_static/comment-bright.png
new file mode 100644
index 0000000..551517b
Binary files /dev/null and b/content/docs/_static/comment-bright.png differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_static/comment-close.png
----------------------------------------------------------------------
diff --git a/content/docs/_static/comment-close.png b/content/docs/_static/comment-close.png
new file mode 100644
index 0000000..09b54be
Binary files /dev/null and b/content/docs/_static/comment-close.png differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_static/comment.png
----------------------------------------------------------------------
diff --git a/content/docs/_static/comment.png b/content/docs/_static/comment.png
new file mode 100644
index 0000000..92feb52
Binary files /dev/null and b/content/docs/_static/comment.png differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_static/css/badge_only.css
----------------------------------------------------------------------
diff --git a/content/docs/_static/css/badge_only.css b/content/docs/_static/css/badge_only.css
new file mode 100644
index 0000000..5f8b720
--- /dev/null
+++ b/content/docs/_static/css/badge_only.css
@@ -0,0 +1,4 @@
+.fa:before{-webkit-font-smoothing:antialiased}.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;content:""}.clearfix:after{clear:both}@font-face{font-family:FontAwesome;font-weight:normal;font-style:normal;src:url("../font/fontawesome_webfont.eot");src:url("../font/fontawesome_webfont.eot?#iefix") format("embedded-opentype"),url("../font/fontawesome_webfont.woff") format("woff"),url("../font/fontawesome_webfont.ttf") format("truetype"),url("../font/fontawesome_webfont.svg#FontAwesome") format("svg")}.fa:before{display:inline-block;font-family:FontAwesome;font-style:normal;font-weight:normal;line-height:1;text-decoration:inherit}a .fa{display:inline-block;text-decoration:inherit}li .fa{display:inline-block}li .fa-large:before,li .fa-large:before{width:1.875em}ul.fas{list-style-type:none;margin-left:2em;text-indent:-0.8em}ul.fas li .fa{width:0.8em}ul.fas li .fa-large:before,ul.fas li .fa-large:before{vertical-align:baseline}.fa-book:before{content:""}.icon-book:be
 fore{content:""}.fa-caret-down:before{content:""}.icon-caret-down:before{content:""}.fa-caret-up:before{content:""}.icon-caret-up:before{content:""}.fa-caret-left:before{content:""}.icon-caret-left:before{content:""}.fa-caret-right:before{content:""}.icon-caret-right:before{content:""}.rst-versions{position:fixed;bottom:0;left:0;width:300px;color:#fcfcfc;background:#1f1d1d;border-top:solid 10px #343131;font-family:"Lato","proxima-nova","Helvetica Neue",Arial,sans-serif;z-index:400}.rst-versions a{color:#2980B9;text-decoration:none}.rst-versions .rst-badge-small{display:none}.rst-versions .rst-current-version{padding:12px;background-color:#272525;display:block;text-align:right;font-size:90%;cursor:pointer;color:#27AE60;*zoom:1}.rst-versions .rst-current-version:before,.rst-versions .rst-current-version:after{display:table;content:""}.rst-versions .rst-current-version:after{clear:both}.rst-versions .rst-current-version .fa{color:#fcfcfc}.rst-versions .rst-cu
 rrent-version .fa-book{float:left}.rst-versions .rst-current-version .icon-book{float:left}.rst-versions .rst-current-version.rst-out-of-date{background-color:#E74C3C;color:#fff}.rst-versions .rst-current-version.rst-active-old-version{background-color:#F1C40F;color:#000}.rst-versions.shift-up .rst-other-versions{display:block}.rst-versions .rst-other-versions{font-size:90%;padding:12px;color:gray;display:none}.rst-versions .rst-other-versions hr{display:block;height:1px;border:0;margin:20px 0;padding:0;border-top:solid 1px #413d3d}.rst-versions .rst-other-versions dd{display:inline-block;margin:0}.rst-versions .rst-other-versions dd a{display:inline-block;padding:6px;color:#fcfcfc}.rst-versions.rst-badge{width:auto;bottom:20px;right:20px;left:auto;border:none;max-width:300px}.rst-versions.rst-badge .icon-book{float:none}.rst-versions.rst-badge .fa-book{float:none}.rst-versions.rst-badge.shift-up .rst-current-version{text-align:right}.rst-versions.rst-badge.shift-up .rst-current-ver
 sion .fa-book{float:left}.rst-versions.rst-badge.shift-up .rst-current-version .icon-book{float:left}.rst-versions.rst-badge .rst-current-version{width:auto;height:30px;line-height:30px;padding:0 6px;display:block;text-align:center}@media screen and (max-width: 768px){.rst-versions{width:85%;display:none}.rst-versions.shift{display:block}img{width:100%;height:auto}}
+/*# sourceMappingURL=badge_only.css.map */
+
+

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_static/css/badge_only.css.map
----------------------------------------------------------------------
diff --git a/content/docs/_static/css/badge_only.css.map b/content/docs/_static/css/badge_only.css.map
new file mode 100644
index 0000000..b09cc62
--- /dev/null
+++ b/content/docs/_static/css/badge_only.css.map
@@ -0,0 +1,7 @@
+{
+"version": 3,
+"mappings": "CAyDA,SAAY,EACV,qBAAsB,EAAE,UAAW,EAqDrC,QAAS,EARP,IAAK,EAAE,AAAC,EACR,+BAAS,EAEP,MAAO,EAAE,IAAK,EACd,MAAO,EAAE,CAAE,EACb,cAAO,EACL,IAAK,EAAE,GAAI,EC1Gb,SAkBC,EAjBC,UAAW,ECFJ,UAAW,EDGlB,UAAW,EAHqC,KAAM,EAItD,SAAU,EAJsD,KAAM,EAapE,EAAG,EAAE,qCAAwB,EAC7B,EAAG,EAAE,0PAAyE,ECZpF,SAAU,EACR,MAAO,EAAE,WAAY,EACrB,UAAW,EAAE,UAAW,EACxB,SAAU,EAAE,KAAM,EAClB,UAAW,EAAE,KAAM,EACnB,UAAW,EAAE,AAAC,EACd,cAAe,EAAE,MAAO,EAG1B,IAAK,EACH,MAAO,EAAE,WAAY,EACrB,cAAe,EAAE,MAAO,EAIxB,KAAG,EACD,MAAO,EAAE,WAAY,EACvB,sCAAiB,EAGf,IAAK,EAAE,MAAY,EAEvB,KAAM,EACJ,cAAe,EAAE,GAAI,EACrB,UAAW,EAAE,EAAG,EAChB,UAAW,EAAE,KAAM,EAEjB,YAAG,EACD,IAAK,EAAE,IAAI,EACb,oDAAiB,EAGf,aAAc,EAAE,OAAQ,EAG9B,cAAe,EACb,MAAO,EAAE,EAAO,EAElB,gBAAiB,EACf,MAAO,EAAE,EAAO,EAElB,oBAAqB,EACnB,MAAO,EAAE,EAAO,EAElB,sBAAuB,EACrB,MAAO,EAAE,EAAO,EAElB,kBAAmB,EACjB,MAAO,EAAE,EAAO,EAElB,oBAAqB,EACnB,MAAO,EAAE,EAAO,EAElB,oBAAqB,EACnB,MAAO,EAAE,EAAO,EAElB,sBAAuB,EACrB,MAAO,EAAE,EAAO,EAElB,qBAAsB,EACpB,MAAO,EAAE,EAAO,EAElB,uBAAwB,EACtB,MAAO,EA
 AE,EAAO,ECnElB,YAAa,EACX,OAAQ,EAAE,IAAK,EACf,KAAM,EAAE,AAAC,EACT,GAAI,EAAE,AAAC,EACP,IAAK,EC6E+B,IAAK,ED5EzC,IAAK,ECE+B,MAAyB,EDD7D,SAAU,EAAE,MAAkC,EAC9C,SAAU,EAAE,iBAAiC,EAC7C,UAAW,EEAyB,sDAAM,EFC1C,MAAO,EC+E6B,EAAG,ED9EvC,cAAC,EACC,IAAK,ECqE6B,MAAW,EDpE7C,cAAe,EAAE,GAAI,EACvB,6BAAgB,EACd,MAAO,EAAE,GAAI,EACf,iCAAoB,EAClB,MAAO,EAAE,GAAqB,EAC9B,eAAgB,EAAE,MAAkC,EACpD,MAAO,EAAE,IAAK,EACd,SAAU,EAAE,IAAK,EACjB,QAAS,EAAE,EAAG,EACd,KAAM,EAAE,MAAO,EACf,IAAK,ECiD6B,MAAM,EJgC1C,IAAK,EAAE,AAAC,EACR,iFAAS,EAEP,MAAO,EAAE,IAAK,EACd,MAAO,EAAE,CAAE,EACb,uCAAO,EACL,IAAK,EAAE,GAAI,EGrFX,qCAAG,EACD,IAAK,EClB2B,MAAyB,EDmB3D,0CAAQ,EACN,IAAK,EAAE,GAAI,EACb,4CAAU,EACR,IAAK,EAAE,GAAI,EACb,iDAAiB,EACf,eAAgB,ECQgB,MAAI,EDPpC,IAAK,EC0B2B,GAAM,EDzBxC,wDAAwB,EACtB,eAAgB,ECXgB,MAAO,EDYvC,IAAK,ECzB2B,GAAI,ED0BxC,yCAA8B,EAC5B,MAAO,EAAE,IAAK,EAChB,gCAAmB,EACjB,QAAS,EAAE,EAAG,EACd,MAAO,EAAE,GAAqB,EAC9B,IAAK,ECE6B,GAAwB,EDD1D,MAAO,EAAE,GAAI,EACb,mCAAE,EACA,MAAO,EAAE,IAAK,EACd,KAAM,EAAE,EAAG,EACX,KAAM,EAAE,AAAC,EACT,
 KAAM,EAAE,KAAM,EACd,MAAO,EAAE,AAAC,EACV,SAAU,EAAE,gBAA6C,EAC3D,mCAAE,EACA,MAAO,EAAE,WAAY,EACrB,KAAM,EAAE,AAAC,EACT,qCAAC,EACC,MAAO,EAAE,WAAY,EACrB,MAAO,EAAE,EAAqB,EAC9B,IAAK,ECjDyB,MAAyB,EDkD7D,sBAAW,EACT,IAAK,EAAE,GAAI,EACX,KAAM,EAAE,GAAI,EACZ,IAAK,EAAE,GAAI,EACX,GAAI,EAAE,GAAI,EACV,KAAM,EAAE,GAAI,EACZ,QAAS,ECkByB,IAAK,EDjBvC,iCAAU,EACR,IAAK,EAAE,GAAI,EACb,+BAAQ,EACN,IAAK,EAAE,GAAI,EACb,oDAA+B,EAC7B,SAAU,EAAE,IAAK,EACjB,6DAAQ,EACN,IAAK,EAAE,GAAI,EACb,+DAAU,EACR,IAAK,EAAE,GAAI,EACf,2CAAoB,EAClB,IAAK,EAAE,GAAI,EACX,KAAM,EAAE,GAAI,EACZ,UAAW,EAAE,GAAI,EACjB,MAAO,EAAE,IAAuB,EAChC,MAAO,EAAE,IAAK,EACd,SAAU,EAAE,KAAM,EGhDpB,mCAAsB,EHmDxB,YAAa,EACX,IAAK,EAAE,EAAG,EACV,MAAO,EAAE,GAAI,EACb,kBAAO,EACL,MAAO,EAAE,IAAK,EAClB,EAAG,EACD,IAAK,EAAE,GAAI,EACX,KAAM,EAAE,GAAI",
+"sources": ["../../../bower_components/wyrm/sass/wyrm_core/_mixin.sass","../../../bower_components/bourbon/dist/css3/_font-face.scss","../../../sass/_theme_badge_fa.sass","../../../sass/_theme_badge.sass","../../../bower_components/wyrm/sass/wyrm_core/_wy_variables.sass","../../../sass/_theme_variables.sass","../../../bower_components/neat/app/assets/stylesheets/grid/_media.scss"],
+"names": [],
+"file": "badge_only.css"
+}

[57/60] [abbrv] incubator-usergrid git commit: removing unneeded file

[sn...@apache.org]

removing unneeded file

(cherry picked from commit 8e32c136af2f9035439c77ad642989c46c791324)


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/6839bc5a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/6839bc5a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/6839bc5a

Branch: refs/heads/two-dot-o-dev
Commit: 6839bc5a51909081bcdaab14e0003dee6055fd2b
Parents: 38afc44
Author: Dave Johnson <sn...@apache.org>
Authored: Wed Aug 12 10:33:26 2015 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Wed Aug 12 13:02:50 2015 -0400

----------------------------------------------------------------------
 docs/sdks/ios.md | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6839bc5a/docs/sdks/ios.md
----------------------------------------------------------------------
diff --git a/docs/sdks/ios.md b/docs/sdks/ios.md
deleted file mode 100644
index 328b09a..0000000
--- a/docs/sdks/ios.md
+++ /dev/null
@@ -1 +0,0 @@
-# iOS SDK
\ No newline at end of file

[37/60] [abbrv] incubator-usergrid git commit: cherry picking docs from master

[sn...@apache.org]

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/data-storage/optimizing-access.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/data-storage/optimizing-access.txt b/content/docs/_sources/data-storage/optimizing-access.txt
new file mode 100644
index 0000000..2e5c0b6
--- /dev/null
+++ b/content/docs/_sources/data-storage/optimizing-access.txt
@@ -0,0 +1,185 @@
+# Data Store Best Practices
+The Usergrid data store is backed by Cassandra, an open source distributed DBMS. Cassandra is specifically designed to support applications that need flexibility and high scalability, particularly web and mobile applications. To get the most out of your Usergrid application, you should optimize your data access with this kind of database in mind.
+
+## Put your data in as you'll want to get it out
+The best practices described here are all related to the theme of putting your data in the way you’ll want to get it out. You’ll model your data with your likely read requests in mind rather than by modeling around the structure of the data itself (as you might with a relational database). In many cases, you can avoid using queries that are inefficient for this kind of database.
+
+You can use the following techniques to optimize data store access:
+
+* __Denormalize and duplicate__. By creating a data model that strategically denormalizes and duplicates data, you can avoid costly queries. In other words, you model the data so that all of the data for a given request is all in one place rather than scattered in a way that a query must account for.
+
+* __Create direct paths to the data you’ll want__. You can optimize your app’s performance by connecting entities your code retrieves most often. With connections, you can avoid some queries that might add complexity and reduce performance.
+
+## Best practice: Denormalize for pre-computed query results
+If you’re familiar with designing relational databases, you’re probably used to normalizing the structure of your data as much as possible. When normalizing an RDBMS data model, you minimize redundancy by ensuring that a column from one table is duplicated only once in any other table, and only when necessary to create primary/secondary key relationships. You then retrieve data that spans tables by joining them with an SQL query.
+
+In contrast, with the Usergrid data store you’ll get better performance by strategically denormalizing and duplicating data. When you denormalize, you combine data from what might (in a relational model) have been separate tables. When duplicating, you intentionally maintain copies of certain entity properties across multiple entities. By denormalizing and duplicating, you can collect the results of requests into a single entity rather than relying on a query.
+
+Part of designing your data model should include identifying the queries your client will make. Then in your data model design, you capture the results of those queries in advance by writing that data into entities of one collection you can read from later.
+
+### Getting review data the relational way
+For example, take a closer look at the relational case through a product database. Imagine you want to present a list of all reviews for a product. When a user chooses a review from the list, you’ll show them a view that includes the review’s title, body, and rating; the product it describes; and who wrote the review. That way, your user will be able to click through to more information about the product or reviewing user.
+
+In a relational database, you’d likely have separate tables for the review-specific information and a rating; for the product; and for the user. Your reviews table would include secondary keys with which to join reviews to the users and products tables. Maybe something like this:
+
+.. image:: reviews.png
+
+To get the data you need, your query might look like the SQL query below. By getting UUIDs for the user and product into your client code, you’re able to give the user a way to get user and product information from the review.
+
+    SELECT review.title, review.body, review.rating, review.uuid, 
+        user.name, user.uuid, product.name, product.uuid 
+        FROM reviews 
+        INNER JOIN users 
+        ON users.uuid = reviews.authorId 
+        INNER JOIN products 
+        ON products.uuid = reviews.productId 
+        WHERE reviews.uuid = <uuid_for_selected_review> 
+        
+But due to Cassandra’s distributed, high-scale design, a join such as this wouldn’t work. So in the Usergrid, you’d get the data by first storing it all in one place.
+
+### Using a denormalized model to store (then retrieve) data
+In the Usergrid, a more efficient way to get the same result would start by including related user and product data with the review data. This would give you a single place to get all the data you'll show.
+
+The following shows how that model might look as entities in the Usergrid. (The users and products entities are included here to remind you that they exist, but they aren’t actually used in this denormalization example.)
+
+.. image:: reviews2.png
+
+This use case assumes that your user and product data are already in the data store. In the following API request code, you’re just adding a new review written by a user about a particular product. The JSON body is your new review entity (the JSON here is non-entitized to make it readable).
+
+    POST https://api.usergrid.com/my_org/my_app/reviews -d { 
+        "title" : "Tempted to climb in myself.", 
+        "body" : "I mean, who doesn't love a bouncy castle? The kids love it!",
+        "rating" : 3, 
+        "authorName" : "Jennie", 
+        "authorUUID" : <author_uuid>, 
+        "authorImage" : "http://<path_to_image>.png", 
+        "productUUID" : <product_uuid>,
+        "productImage" : "http://<path_to_image>.jpg", 
+        "productName" : "Magic Castle Bounce House Inflatable Bouncer" 
+    }
+    
+Notice that you’re adding user and product data (which your client code would have at hand when the user posts the review) when you’re adding the review-specific data.
+
+Retrieving all the data from one place
+You’d get the review, including the subset of product and user data you need right away, by making one API call such as the following (note there’s no SQL-like query string needed):
+
+    GET http://api.usergrid.com/my_org/my_app/reviews/<review_uuid> 
+
+Your result might look like this. The highlighted lines show data you'd present to the user.
+
+    { 
+        "action" : "get", 
+        "application" : "<app_uuid>", 
+        "params" : { }, 
+        "path" : "/reviews", 
+        "uri" : "https://api.usergrid.com/my_org/my_app/reviews", 
+        "entities" : [ {
+            "uuid" : "<review_uuid>", 
+            "type" : "review", 
+            "created" : 1395410364673, 
+            "modified" : 1395410364673, 
+            "authorName" : "Jennie", 
+            "authorImage" : "<path_to_image>.png", 
+            "authorUUID" : "<author_uuid>", 
+            "body" : "I mean, who doesn't love a bouncy castle? The kids love it!", 
+            "metadata" : { 
+                "path" : "/reviews/<review_uuid>" 
+            },
+            "productImage" : "http://<path_to_image>.jpg", 
+            "productName" : "Magic Castle Bounce House Inflatable Bouncer", 
+            "productUUID" : "<product_uuid>", 
+            "rating" : 3, 
+            "title" : "Tempted to climb in myself." 
+        } ], 
+        "timestamp" : 1395764951934, 
+        "duration" : 16, 
+        "organization" : "my_org", 
+        "applicationName" : "my_app" 
+    }
+
+This gives you, in one request, all the review information you’d planned on presenting to your app’s users for a single view. Your client code could retrieve the review entity in the result, along with the product and user data, then present it all as a review.
+
+Best practice: Connect entities to simplify scoped requests
+Another way to streamline your requests is to connect entities by using the built-in connections feature. In a sense, a connection can replace the WHERE clause of a query you might have written.
+
+Getting back to the review example, imagine you want to retrieve all of the reviews written by a particular user. In the relational example, you might have an SQL query such as this:
+
+    SELECT * FROM reviews WHERE authorId = <user_uuid>; 
+
+Even in the Usergrid, you could use a similar syntax in a query string appended to an API path. Working from the review entity model in the preceding example, that might look like this (though yours would likely entitize the spaces):
+
+    GET http://api.usergrid.com/my_org/my_app/reviews?ql=select * where
+            authorUUID=<user_uuid> 
+            
+But if this is an API call you’re going to be making often, there’s a better way. Instead, create a connection between the review and the user when your code creates the review. You can connect entities with a verb that describes their relationship to one another.
+
+The following creates Jennie’s review and at the same time connects her as the person who “wrote” it. (For easier reading, this example contains spaces you wouldn’t be able to include.)
+
+    POST http://api.usergrid.com/my_org/my_app/users/jennie/wrote/reviews { 
+        "title" : "Tempted to climb in myself.", 
+        "body" : "I mean, who doesn't love a bouncy castle? The kids love it!", 
+        "rating" : 3, 
+        "authorName" : "Jennie", 
+        "authorImage" : "http://<path_to_image>.png", 
+        "productName" : "Magic Castle Bounce House Inflatable Bouncer", 
+        "productImage" : "http://<path_to_image>.jpg" 
+    }
+
+When reading the data, you’d retrieve all of the reviews Jennie has written with a URL that’s nearly identical, minus the JSON:
+
+    GET http://api.usergrid.com/my_org/my_app/users/jennie/wrote/reviews 
+
+Your request result would look something like the following. Here, the entities array returned contains the reviews you connected with Jennie (though there’s only one in this example). The connection-specific metadata is highlighted.
+
+    {
+        "action" : "get", 
+        "application" : "<app_uuid>", 
+        "params" : { }, 
+        "path" : "/users/<user_uuid>/wrote", 
+        "uri" : "https://api.usergrid.com/my_org/my_app/users/<user_uuid>/wrote", 
+        "entities" : [ {
+            "uuid" : "<review_uuid>", 
+            "type" : "review", 
+            "created" : 1395410364673, 
+            "modified" : 1395410364673, 
+            "authorName" : "Jennie", 
+            "authorImage" : "http://<path_to_image>.png", 
+            "authorUUID" : "<user_uuid>", 
+            "body" : "I mean, who doesn't love a bouncy castle? Kids love it!", 
+            "metadata" : { 
+                "connecting" : {
+                    "wrote" : "/users/<user_uuid>/wrote/<review_uuid>/connecting/wrote" 
+                },
+                "path" : "/users/<user_uuid>/wrote/<review_uuid>", 
+            }, 
+            "productImage" : "http://<path_to_image>.jpg", 
+            "productName" : "Magic Castle Bounce House Inflatable Bouncer", 
+            "productUUID" : "<product_uuid>", 
+            "rating" : 3, 
+            "title" : "Tempted to climb in myself." 
+        } ], 
+        "timestamp" : 1395777037697, 
+        "duration" : 19, 
+        "organization" : "my_org", 
+        "applicationName" : "my_app" 
+    } 
+
+To retrieve a particular review written by Jennie, you could use something like the following:
+
+    GET http://api.usergrid.com/my_org/my_app/users/jennie/wrote/reviews/<review_uuid> 
+
+You can create connections to set up relationships you can use to later retrieve data quickly and with a simple syntax.
+
+For example, when creating a connected entity (such as the review entity here), you can at the same time create other connections to connect the product to the new review, then connect the product to its reviewer (paths are abbreviated in these examples):
+
+    POST /users/jennie/wrote/reviews {<review_entity_json>} 
+    POST /products/<reviewed_product_uuid>/reviewedIn/reviews/<new_review_uuid> 
+    POST /products/<reviewed_product_uuid>/reviewedBy/users/jennie 
+
+Having created these connections for each review you post, in addition to getting the review the user wrote, you could later also:
+
+Get the reviews for a product:
+
+    GET /products/<reviewed_product_uuid>/reviewedIn/reviews 
+    Get the users who reviewed the product:
+    GET /products/<reviewed_product_uuid>/reviewedBy/users 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/entity-connections/connecting-entities.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/entity-connections/connecting-entities.txt b/content/docs/_sources/entity-connections/connecting-entities.txt
new file mode 100644
index 0000000..1c6219e
--- /dev/null
+++ b/content/docs/_sources/entity-connections/connecting-entities.txt
@@ -0,0 +1,60 @@
+# Connecting entities
+
+When creating a connection, if you specify the collection of the entity being connected to, you can create the connection using the value of its 'name' property or its UUID.
+
+## Request syntax
+
+To create a connection, the entity being connected to can either be specified by just its UUID, or both its collection and the value of its 'name' property.
+
+Connect by UUID
+
+    curl -X POST https://api.usergrid.com/<org>/<app>/<connecting_collection>/<connecting_entity>/<relationship>/<connected_entity>
+    
+Connect by 'name' property
+
+    curl -X POST https://api.usergrid.com/<org>/<app>/<connecting_collection>/<connecting_entity>/<relationship>/<connected_collection>/<connected_entity>
+
+Parameters
+
+Parameter	            Description
+---------               -----------
+org	                    Organization UUID or organization name
+app	                    Application UUID or application name
+connecting_collection	Name or UUID of the collection of the connecting entity.
+connecting_entity	    Name or UUID of the connecting entity. 
+relationship	        Type of connection being created (e.g., likes)
+connected_collection	Name or UUID of the collection of the entity being connected to. 
+connected_entity	    Name or UUID of the entity being connected to.
+
+If the connecting entity is a 'user' entity, the 'username' should be used rather than the 'name'.
+
+'connected_collection' is not required if the entity being connected to is specified by its UUID.
+
+Example request
+
+    curl -X POST http://api.usergrid.com/your-org/your-app/users/Arthur/likes/6c56ffda-9e75-11e3-99fd-8dd1801e534c
+
+Example Response
+
+    {
+        "action" : "post",
+        "application" : "db1e60a0-417f-11e3-9586-0f1ff3650d20",
+        "params" : { },
+        "path" : "/users/174785aa-8ea8-11e3-ae1f-eb20e5bce407/likes",
+        "uri" : "https://api.usergrid.com/my-org/my-app/users/174785aa-8ea8-11e3-ae1f-eb20e5bce407/likes",
+        "entities" : [ {
+            "uuid" : "6c56ffda-9e75-11e3-99fd-8dd1801e534c",
+            "type" : "user",
+            "name" : "Arthur",
+            "created" : 1393371291725,
+            "modified" : 1393371291725,
+            "metadata" : {
+                "path" : "/users/174785aa-8ea8-11e3-ae1f-eb20e5bce407/likes/6c56ffda-9e75-11e3-99fd-8dd1801e534c"
+            }
+        } ],
+        "timestamp" : 1393371455487,
+        "duration" : 77,
+        "organization" : "your-org",
+        "applicationName" : "your-app"
+    }
+	
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/entity-connections/disconnecting-entities.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/entity-connections/disconnecting-entities.txt b/content/docs/_sources/entity-connections/disconnecting-entities.txt
new file mode 100644
index 0000000..b52d62d
--- /dev/null
+++ b/content/docs/_sources/entity-connections/disconnecting-entities.txt
@@ -0,0 +1,79 @@
+# Disconnecting entities
+
+To disconnect a user from other data, perform a DELETE operation against the same endpoint at which you posted to create the connection.
+
+## Request syntax
+
+Disconnect by UUID
+
+    curl -X DELETE https://api.usergrid.com/<org>/<app>/<connecting_collection>/<connecting_entity>/<relationship>/<connected_entity>
+    
+Disconnect by 'name' property
+
+    curl -X DELETE https://api.usergrid.com/<org>/<app>/<connecting_collection>/<connecting_entity>/<relationship>/<connected_collection>/<connected_entity>
+    
+Parameters
+
+Parameter	            Description
+---------               -----------
+org	                    Organization UUID or organization name
+app	                    Application UUID or application name
+connecting_collection	Name or UUID of the collection of the connecting entity.
+connecting_entity	    Name or UUID of the connecting entity. 
+relationship	        Type of connection being created (e.g., likes)
+connected_collection	Name or UUID of the collection of the entity being connected to. 
+connected_entity	    Name or UUID of the entity being connected to.
+
+If the connecting entity is a 'user' entity, the 'username' should be used rather than the 'name'.
+
+'connected_collection' is not required if the entity being connected to is specified by its UUID.Parameter	
+
+Example request
+
+    curl -X DELETE https://api.usergrid.com/your-org/your-app/users/Arthur/likes/users/Ford
+
+Example response
+
+    {
+      "action" : "delete",
+      "application" : "k88dh4f-a166-11e2-a7f7-02e81adcf3d0",
+      "params" : { },
+      "path" : "/users/58606d0a-cfed-11e3-a694-dbf5228024a7/likes",
+      "uri" : "https://api.usergrid.com/your-org/your-app/users/58606d0a-cfed-11e3-a694-dbf5228024a7/likes",
+      "entities" : [ {
+        "uuid" : "5bcc47ca-cfed-11e3-8bde-a7e008061e10",
+        "type" : "user",
+        "created" : 1398810410556,
+        "modified" : 1398810410556,
+        "username" : "Ford",
+        "activated" : true,
+        "metadata" : {
+          "connecting" : {
+            "likes" : "/users/58606d0a-cfed-11e3-a694-dbf5228024a7/likes/5bcc47ca-cfed-11e3-8bde-a7e008061e10/connecting/likes"
+          },
+          "path" : "/users/58606d0a-cfed-11e3-a694-dbf5228024a7/likes/5bcc47ca-cfed-11e3-8bde-a7e008061e10",
+          "sets" : {
+            "rolenames" : "/users/58606d0a-cfed-11e3-a694-dbf5228024a7/likes/5bcc47ca-cfed-11e3-8bde-a7e008061e10/roles",
+            "permissions" : "/users/58606d0a-cfed-11e3-a694-dbf5228024a7/likes/5bcc47ca-cfed-11e3-8bde-a7e008061e10/permissions"
+          },
+          "connections" : {
+            "friends" : "/users/58606d0a-cfed-11e3-a694-dbf5228024a7/likes/5bcc47ca-cfed-11e3-8bde-a7e008061e10/friends",
+            "likes" : "/users/58606d0a-cfed-11e3-a694-dbf5228024a7/likes/5bcc47ca-cfed-11e3-8bde-a7e008061e10/likes"
+          },
+          "collections" : {
+            "activities" : "/users/58606d0a-cfed-11e3-a694-dbf5228024a7/likes/5bcc47ca-cfed-11e3-8bde-a7e008061e10/activities",
+            "devices" : "/users/58606d0a-cfed-11e3-a694-dbf5228024a7/likes/5bcc47ca-cfed-11e3-8bde-a7e008061e10/devices",
+            "feed" : "/users/58606d0a-cfed-11e3-a694-dbf5228024a7/likes/5bcc47ca-cfed-11e3-8bde-a7e008061e10/feed",
+            "groups" : "/users/58606d0a-cfed-11e3-a694-dbf5228024a7/likes/5bcc47ca-cfed-11e3-8bde-a7e008061e10/groups",
+            "roles" : "/users/58606d0a-cfed-11e3-a694-dbf5228024a7/likes/5bcc47ca-cfed-11e3-8bde-a7e008061e10/roles",
+            "following" : "/users/58606d0a-cfed-11e3-a694-dbf5228024a7/likes/5bcc47ca-cfed-11e3-8bde-a7e008061e10/following",
+            "followers" : "/users/58606d0a-cfed-11e3-a694-dbf5228024a7/likes/5bcc47ca-cfed-11e3-8bde-a7e008061e10/followers"
+          }
+        }
+      } ],
+      "timestamp" : 1398962837195,
+      "duration" : 85,
+      "organization" : "your-org",
+      "applicationName" : "your-app"
+    }
+	
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/entity-connections/relationships.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/entity-connections/relationships.txt b/content/docs/_sources/entity-connections/relationships.txt
new file mode 100644
index 0000000..73bc6c3
--- /dev/null
+++ b/content/docs/_sources/entity-connections/relationships.txt
@@ -0,0 +1,98 @@
+# Relationships
+
+## Creating connections between entities
+
+One of the most useful features of Usergrid is the ability to create
+connections between entities. A simple example of this is the
+Twitter-like use of *following*, where one user forms a connection with
+another by subscribing to any tweets they post. [Messagee
+Example](/messagee-example) walks you through an example of following
+other users in our sample app, *Messagee*. Here is the basic format:
+
+    POST https://api.usergrid.com/my-org/my-app/users/fred/following/users/barney
+
+This API call results in two users, Fred and Barney, linked with a
+connection where Fred is following Barney.
+
+If you create a *following* connection between two users, Apache Usergrid
+automatically creates a virtual connection called *followers* that
+mirrors the *following* connection. In other words, if you create a
+connection where Fred is following Barney, Apache Usergrid automatically
+creates a virtual connection where Fred is a follower of Barney.
+
+Note that there is no mirror connection established. Apache Usergrid only
+creates a mirror connection when you create a *following* connection. It
+does not create a mirror connection for other verbs such as likes.
+
+You can see all the users that Fred is following, in this case only
+Barney, by making the following API call:
+
+    GET https://api.usergrid.com/my-org/my-app/users/fred/following
+
+You can see all of barney’s followers, in this case only Fred, by making
+the following API call:
+
+    GET https://api.usergrid.com/my-org/my-app/users/barney/followers
+
+The *followers* connection is a virtual connection because you can’t use
+it to link two entities. In other words, you can’t make fred a follower
+of barney by using a *followers* connection.  **This is wrong:**
+
+    POST https://api.usergrid.com/my-org/my-app/users/barney/followers/users/fred
+
+To create a *following* connection with the users switched, so that
+Barney is following Fred, do this:
+
+    POST https://api.usergrid.com/my-org/my-app/users/barney/following/users/fred
+
+You can now see Fred’s followers (only Barney) by making the following
+call:
+
+    GET https://api.usergrid.com/my-org/my-app/users/fred/followers
+
+## Creating other connections
+
+You can extend this connection structure to create connections using any
+"verb" that can link two entities. For example, you could use likes to
+denote a connection between a user and his dog. First, create a dogs
+collection:
+
+    POST https://api.usergrid.com/my-org/my-app/dogs
+
+Then populate this collection with a new dog named Dino:
+
+    POST https://api.usergrid.com/my-org/my-app/dogs {"name" : "dino"}
+
+Then create a likes connection between Fred and his dog Dino:
+
+    POST https://api.usergrid.com/my-org/my-app/users/fred/likes/dogs/dino
+
+Getting connections
+-------------------
+
+### Get all connections for an entity
+
+To get a list that only contains the connections, do a GET on the
+connections sub-property of the entity:
+
+    GET https://api.usergrid.com/my-org/my-app/users/fred/connections
+
+### Get information on a specific connection type
+
+To get a list of users who like Fred:
+
+    GET https://api.usergrid.com/my-org/my-app/users/fred/connecting/likes
+
+To get a list of all dogs that Fred likes:
+
+    GET https://api.usergrid.com/my-org/my-app/users/fred/likes/dog
+
+Deleting a connection
+---------------------
+
+You can delete a connection in a way similar to creating one. Just
+replace the POST method with the DELETE method. For example, you can
+delete the connection between fred and barney with the following API
+call:
+
+    DELETE https://api.usergrid.com/my-org/my-app/users/fred/following/barney

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/entity-connections/retrieving-entities.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/entity-connections/retrieving-entities.txt b/content/docs/_sources/entity-connections/retrieving-entities.txt
new file mode 100644
index 0000000..31eaf9c
--- /dev/null
+++ b/content/docs/_sources/entity-connections/retrieving-entities.txt
@@ -0,0 +1,94 @@
+# Retrieving connections
+
+Viewing all of an entities connections
+To see all of the connection types associated with an entity, simply retrieve the entity.
+
+All of the connection types the entity has made to other entities will appear in the metadata.connections property.
+
+All of the connection types that other entities have made to the entity will appear in the metadata.connecting property.
+
+For user entities, following/followers connections can be accessed by sending a GET request to the URL in the collections.following and collections.followers properties.
+
+Retrieve connected entities by connection type
+To get a list of entities a specified entity has connected to with a specific connection type, do the following:
+
+## Request syntax
+
+    curl -X GET https://api.usergrid.com/<org>/<app>/<collection>/<entity>/<relationship>
+
+Parameters
+
+Parameter	    Description
+---------       -----------
+org	            Organization UUID or organization name
+app	            Application UUID or application name
+collection	    Name or UUID of the collection of the entity you want to retrieve the connections of.
+entity	        Name or UUID of the entity whose connections you want to retrieve
+relationship	The connection type you want to retrieve the entities for. 
+
+For example, specifying a relationship of 'likes' would return a list of all entities that have the 'likes' connection with the specified entity.
+
+Example request
+
+    curl -X GET https://api.usergrid.com/your-org/your-app/users/Arthur/likes
+
+Example response
+
+Notice that the entities are returned as a JSON array in the entities property.
+
+    {
+      "action" : "get",
+      "application" : "dk88fh4r-a166-11e2-a7f7-02e81adcf3d0",
+      "params" : { },
+      "path" : "/users/58606d0a-cfed-11e3-a694-dbf5228024a7/likes",
+      "uri" : "https://api.usergrid.com/your-org/your-app/users/58606d0a-cfed-11e3-a694-dbf5228024a7/likes",
+      "entities" : [ {
+        "uuid" : "5bcc47ca-cfed-11e3-8bde-a7e008061e10",
+        "type" : "user",
+        "created" : 1398810410556,
+        "modified" : 1398810410556,
+        "username" : "Ford",
+        "activated" : true,
+        "metadata" : {
+          "connecting" : {
+            "likes" : "/users/58606d0a-cfed-11e3-a694-dbf5228024a7/likes/5bcc47ca-cfed-11e3-8bde-a7e008061e10/connecting/likes"
+          },
+          "path" : "/users/58606d0a-cfed-11e3-a694-dbf5228024a7/likes/5bcc47ca-cfed-11e3-8bde-a7e008061e10",
+          "sets" : {
+            "rolenames" : "/users/58606d0a-cfed-11e3-a694-dbf5228024a7/likes/5bcc47ca-cfed-11e3-8bde-a7e008061e10/roles",
+            "permissions" : "/users/58606d0a-cfed-11e3-a694-dbf5228024a7/likes/5bcc47ca-cfed-11e3-8bde-a7e008061e10/permissions"
+          },
+          "collections" : {
+            "activities" : "/users/58606d0a-cfed-11e3-a694-dbf5228024a7/likes/5bcc47ca-cfed-11e3-8bde-a7e008061e10/activities",
+            "devices" : "/users/58606d0a-cfed-11e3-a694-dbf5228024a7/likes/5bcc47ca-cfed-11e3-8bde-a7e008061e10/devices",
+            "feed" : "/users/58606d0a-cfed-11e3-a694-dbf5228024a7/likes/5bcc47ca-cfed-11e3-8bde-a7e008061e10/feed",
+            "groups" : "/users/58606d0a-cfed-11e3-a694-dbf5228024a7/likes/5bcc47ca-cfed-11e3-8bde-a7e008061e10/groups",
+            "roles" : "/users/58606d0a-cfed-11e3-a694-dbf5228024a7/likes/5bcc47ca-cfed-11e3-8bde-a7e008061e10/roles",
+            "following" : "/users/58606d0a-cfed-11e3-a694-dbf5228024a7/likes/5bcc47ca-cfed-11e3-8bde-a7e008061e10/following",
+            "followers" : "/users/58606d0a-cfed-11e3-a694-dbf5228024a7/likes/5bcc47ca-cfed-11e3-8bde-a7e008061e10/followers"
+          }
+        }
+      } ],
+      "timestamp" : 1398884631067,
+      "duration" : 41,
+      "organization" : "your-org",
+      "applicationName" : "your-app"
+    }
+		
+## Retrieve all connected entities
+
+To get a list of all the entities a specified entity has connected to, use the same method as shown above in Retrieve connected entities by connection type, and set the relationship to connections.
+
+All of the entities that have made a connection of that type to the specified entity will be returned in the entities property of the response.
+
+## Retrieve all connecting entities by type
+
+To get a list of all the entities that have created a connection of a specific type to a specified entity, use the same method as shown above in Retrieve connected entities by connection type, and set the relationship to connecting/<relationship>.
+
+All of the entities that have made a connection to the specified entity will be returned in the entities property of the response.
+
+## Retrieve all connecting entities
+
+To get a list of all the entities that have connected to a specified entity, use the same method as shown above in Retrieve connected entities by connection type, and set the relationship to connecting.
+
+All of the entities that have made a connection to the specified entity will be returned in the entities property of the response.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/geolocation/geolocation.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/geolocation/geolocation.txt b/content/docs/_sources/geolocation/geolocation.txt
new file mode 100644
index 0000000..ede4e3c
--- /dev/null
+++ b/content/docs/_sources/geolocation/geolocation.txt
@@ -0,0 +1,72 @@
+# Geolocating your Entities 
+Many of today's apps are enhanced by the use of geolocation – wireless detection of the physical location of a remote device. These apps determine the user's position and use this data to enhance user experience. For example, apps can capture the exact location where a picture was taken or determine what businesses stored in the database to return to the user based on their current location.
+
+API Services provides a standard format for storing geolocation information in any entity, as well as syntax for querying that data based on distance from a latitude/longitude point.
+
+## Saving location data in an entity
+In API Services, geolocation data is saved in the location property of an entity with latitude and longitude sub-properites in the following format:
+
+    "location": {	
+        "latitude": <latitude_coordinate>,
+        "longitude": <longitude_coordinate>  
+    } 	
+    
+An entity's geolocation can be specified when the entity is [created](../data-storage/entities.html#creating-custom-data-entities) or added later by [updating](../data-storage/entities.html#updating-data-entities) an existing entity.
+
+For example, the following entity describes a restaurant:
+
+	{
+	    "uuid" : "03ae956a-249f-11e3-9f80-d16344f5a0e1",
+	    "type" : "restaurant",
+	    "name" : "Rockadero",
+			"location": {
+			    "latitude": 37.779632,
+			    "longitude": -122.395131  
+			} 
+	    "created" : 1379975113142,
+	    "modified" : 1379975113142,
+	    "metadata" : {
+	      "path" : "/restaurants/03ae956a-249f-11e3-9f80-d16344f5a0e1"
+	}      
+	
+## Querying location data
+Location-aware apps require the ability to return content and results based on the user's current location. To easily enable this, API Services supports the following query parameter to retrieve entities within a specified distance of any geocoordinate based on its location property:
+
+	location within <distance_in_meters> of <latitude>, <longitude>
+	
+The returned results are sorted from nearest to furthest. Entities with the same location are returned in the order they were created.
+
+The location parameter can be appended to any standard API Services query. For more information on how to query your API Services data, see Querying your data.
+
+For example, here is how you would find all the devices within 8,046 meters (~10 miles) of the center of San Francisco:
+
+	curl -X GET https://api.usergrid.com/your-org/your-app/devices?ql=location within 8046 of 37.774989,-122.419413
+	
+## Enrich your app with location data
+Location-awareness has become a feature users expect in many types of mobile applications because of its ability to create a more personalized and relevant experience for each user. With this in mind, the geolocation feature in API Services was designed to work with many of the available [default data entities](../api-docs.html#models) to allow app developers to easily integrate powerful in-app features that can increase user engagement.
+
+Here are just a few of the ways that saving location data to a data entity can improve an app:
+
+<table class="usergrid-table">
+<tr>
+  <th>Entity</th>
+  <th>Usage</th>
+</tr>
+<tr>
+  <td>user</td>
+  <td>Save the location of a user's home as part of their profile in the ``users`` collection to suggest upcoming special events or activities located nearby, or to display advertisements that are relevant based on the user's proximity to a business.</td>
+</tr>
+<tr>
+  <td>device</td>
+  <td>Periodically save the location data returned from a user's device, then query the ``devices`` collection to send offers and alerts to user's that are located near your business with a [push notification](../push-notifications/push-notifications-overview).</td>
+</tr>
+<tr>
+  <td>activity</td>
+  <td>Create stronger social connections by associating a user ``activity`` with the location where it occurred. The activity can then be displayed to nearby friends and family, or used to enrich the user's activity stream.</td>
+</tr>
+<tr>
+  <td>asset</td>
+  <td>Save user photos with location data in the ``asset collection`` to allow users to retrieve and sort their memories based on when and where they happened.</td>
+</tr>
+</table>
+

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/geolocation/tbd.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/geolocation/tbd.txt b/content/docs/_sources/geolocation/tbd.txt
new file mode 100644
index 0000000..279d128
--- /dev/null
+++ b/content/docs/_sources/geolocation/tbd.txt
@@ -0,0 +1 @@
+# COMING SOON...
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/getting-started/creating-a-new-application.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/getting-started/creating-a-new-application.txt b/content/docs/_sources/getting-started/creating-a-new-application.txt
new file mode 100644
index 0000000..cc5f577
--- /dev/null
+++ b/content/docs/_sources/getting-started/creating-a-new-application.txt
@@ -0,0 +1,14 @@
+# Creating a new application
+
+## Creating an application
+You can use the admin portal to create applications. An application represents the data associated with your app. Through an application, you handle the entities associated with your app, including users, devices, events, and so on.
+
+To create a new application with the admin portal:
+
+1. In the admin portal, from the dropdown menu at the far top left, select the organization to which you will add the new application.
+1. Click the ADD NEW APP button, located at the top of the screen, next to the application drop-down.
+1. In the dialog box, enter a new application name, then click the Create button. Your new application will automatically be selected in the applications drop-down menu.
+Applications can also be created programmatically with a POST request to the API. For more, see Application.
+
+## Securing an application
+If this is going to be a production application, be sure to configure security roles that provide only the level of access your users will need. For more on security, see Security best practices.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/getting-started/creating-account.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/getting-started/creating-account.txt b/content/docs/_sources/getting-started/creating-account.txt
new file mode 100644
index 0000000..1440926
--- /dev/null
+++ b/content/docs/_sources/getting-started/creating-account.txt
@@ -0,0 +1,21 @@
+# Creating an Usergrid Account
+To get started using the Usergrid, you'll need an Usergrid account. (Before reading this, you should already be familiar with what Usergrid can do to support your apps. If you're still curious about that, you might want to read Usergrid features first.)
+
+With an account, you get the following useful things:
+
+* A sandbox application you can try things with (we automatically create one for you with your new account). The sandbox is a partitioned area of the data store where you can add example data and try out API calls. The sandbox isn't secure, but it's handy to play in. For more about the sandbox, see "Using Your Application Sandbox".
+* The ability to create more applications (in addition to the sandbox). You can (and should!) make these as secure as you need to. These are the applications that you'll have behind the apps you make available to your users.
+* Access to the Admin Portal. In the portal, you can do the following:
+** Create and manage applications.
+** Manage your app's users, including access levels.
+** Manage the data in your app.
+** Manage app features, including push notifications, activities, analytics, and so on.
+** Try out API calls with a shell command window.
+** To create an Usergrid account and see a very short tutorial to get started with, go to the get started page.
+
+## Next steps
+Ready to learn and do more?
+
+* Install an SDK that will be most useful for your application environment. For more about Usergrid's SDKs, see SDKs.
+* Review Usergrid features for information on concepts and features.
+* Consult the API Reference for usage details.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/getting-started/using-a-sandbox-app.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/getting-started/using-a-sandbox-app.txt b/content/docs/_sources/getting-started/using-a-sandbox-app.txt
new file mode 100644
index 0000000..7fb9cd1
--- /dev/null
+++ b/content/docs/_sources/getting-started/using-a-sandbox-app.txt
@@ -0,0 +1,39 @@
+# Using a Sandbox Application
+
+## What is the sandbox application?
+
+When you create a new Usergrid account (see Creating an Usergrid Account) to use services for developers, Usergrid creates a new application for you on its servers. With the new application, called "sandbox," you can add your own example data and try out API calls that do things with the data. Be sure to see Using the API for suggestions.
+
+## Is the sandbox secure?
+
+To keep things simple and make it easier for you to try things out, the sandbox application has all authentication disabled. That way, it doesn’t require an access token for application-level calls to the API. Permissions are so open on the sandbox application because its "guest" role offers full permissions for all access paths -- that is, GET, POST, PUT, and DELETE for /**. Learn more about roles and permissions in Managing access by defining permission rules.
+
+<!-- workaround a Sphinx bug -->
+<div class="admonition warning"><p class="first admonition-title">Warning</p><p class="last">
+<p class="last">Never use a sandbox app for production.
+Keep in mind that the lack of authentication means that a sandbox application is not secure enough for important or sensitive data. A sandbox is just for experimentation while you learn how the services work, and should never be used for a production application. As with other Usergrid applications you create, a sandbox application is an area of the data store where you can put your own data. You can create as many other applications as you like, including more sandbox applications. When it comes to production (secured) applications, a good rule of thumb is to create one application for each mobile app you develop.
+</p>
+</div>
+
+## Creating a New Sandbox Application
+
+You may want to create (or re-create) a sandbox application. For example, you may want to create a sandbox application for another organization or you may want to create another application for testing purposes.
+
+<!-- workaround a Sphinx bug -->
+<div class="admonition warning"><p class="first admonition-title">Warning</p><p class="last">
+Guest Role should never be given full permissions.
+Giving the guest role full permissions should be used only for testing and should not be used in production. Before you make your app “live”, you should remove the guest permissions for /**.
+</p></div>
+
+Use the following steps to create a sandbox app:
+
+1. Create a new application using the admin portal. You can name the application whatever you like (including "sandbox").
+2. Set full access permissions for the guest role, as follows:
+    1. In the admin portal, click Users, then click Roles.
+    2. On the Roles page, in the list of roles, click Guest.
+    3. For the Guest role, under Permissions, click Add Permission.
+    4. In the New Permission dialog, enter the following in the Path box: ``/**``
+    5. Select the following check boxes: get, post, put, and delete.
+    6. Click the Add button.
+    7. If there are other permissions listed, delete them.
+

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/getting-started/using-the-api.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/getting-started/using-the-api.txt b/content/docs/_sources/getting-started/using-the-api.txt
new file mode 100644
index 0000000..9a7ba2d
--- /dev/null
+++ b/content/docs/_sources/getting-started/using-the-api.txt
@@ -0,0 +1,150 @@
+# Using the API
+Usergrid uses a pure REST (Representational State Transfer) API built as a collection of resources. Resource locations are described by paths that are related intrinsically to collections and entities in collections.
+
+This section gives several examples of how to construct API requests. To focus on what's important, the examples use an abbreviated path that starts after the application UUID, or application name. For example, instead of giving a fully qualified path name as in:
+
+    https://api.usergrid.com/your-org/your-app/users
+   
+the example simply lists this:
+
+    /users
+    
+## Supported HTTP methods
+When building a REST API, the challenge is to represent the data and the action upon the data as a path to a resource that can be created, retrieved, updated, or deleted. The HTTP methods POST, GET, PUT, and DELETE correspond to the actions that are applied to resources.
+
+## Base URL
+The base url for all requests made to Usergrid depends on where you have Usergrid installed. If you are using Apigee's trial Usergrid service, the base URL is ``https://api.usergrid.com.``
+
+## Request construction
+Usergrid interprets the URL resource path as a list of names, UUIDs, or queries. The basic path format is:
+
+    https://api.usergrid.com/<org-uuid|org-name>/<app-uuid|app-name>/<collection-name>/<entity-uuid|entity-name>
+    
+Note: You cannot mix UUIDs and names in the URL resource path. For example, the following is incorrect:
+
+    https://api.usergrid.com/your-org/62de5d97-d28c-11e1-8d5c-12313b01d5c1/users/john.doe
+    
+## Accessing collections
+To access all entities in a collection, specify the path as follows:
+
+    /users
+    
+Such a request retrieves the first 10 entities in the collection /users sorted by their entity UUID.
+
+## Accessing entities
+To access an entity in a collection, specify the path as follows:
+
+    /<collection>/<uuid|name>
+
+where ``<collection>`` is the collection name, and <uuid|name> is the entity’s uuid or name.
+
+To access a user in the users collection, specify the path as follows:
+
+    /users/<uuid|username|email_address>
+    
+where ``<uuid|username|email_address>`` is the user’s uuid, username, or email address.
+
+For example, the following request retrieves the entity named dino from the dogs collection:
+
+    /dogs/dino
+
+## Issuing queries
+You can issue a query in an API request that retrieves items from a collection. Here is the typical format for queries:
+
+    /<collection>?ql=<query>
+
+where <query> is a query in the query language.
+
+For example, this request retrieves users whose Facebook first name is john:
+
+    /users?ql=select * where facebook.first_name ='john'
+
+For further information about queries, see Queries and parameters.
+
+## Authentication (OAuth)
+Usergrid implements the OAuth 2.0 standard for authenticating users, clients and API requests.
+
+Generally, you will generate a token for every user of your app by providing the user's username and password. The token can then be sent with all API requests to ensure each user is only able to access and modify the resources you have granted them rights to.
+
+Note that by default access tokens are not needed to make requests to the default sandbox application in an organization.
+
+For more information on generating and using access tokens, see Authenticating users and application clients and Authenticating API requests.
+
+## Response format
+All API methods return a response object that typically contains an array of entities:
+
+    {
+      "entities" : [
+        ...
+      ]
+    }
+
+Not everything can be included inside the entity, and some of the data that gets associated with specific entities isn't part of their persistent representation. This is metadata, and it can be part of the response as well as associated with a specific entity. Metadata is just an arbitrary key/value JSON structure.
+
+For example:
+
+    {
+      "entities" : {
+        {
+          "name" : "ed",
+          "metadata" : {
+            "collections" : ["activities", "groups", "followers"]
+          }
+        }
+      },
+      "metadata" : {
+        "foo" : ["bar", "baz"]
+      }
+    }
+
+For example, here is the response to a basic GET for a user entity:
+
+    {
+      "action" : "get",
+      "application" : "f34f4222-a166-11e2-a7f7-02e81adcf3d0",
+      "params" : { },
+      "path" : "/users",
+      "uri" : "https://api.usergrid.com/your-org/your-app/users",
+      "entities" : [ {
+        "uuid" : "503f17da-ec39-11e3-a0dd-a554b7fbd57a",
+        "type" : "user",
+        "created" : 1401921665485,
+        "modified" : 1401921665485,
+        "username" : "someUser",
+        "email" : "someUser@yourdomain.com",
+        "activated" : true,
+        "picture" : "http://www.gravatar.com/avatar/dc5d478e9c029853fbd025bed0dc51f8",
+        "metadata" : {
+          "path" : "/users/503f17da-ec39-11e3-a0dd-a554b7fbd57a",
+          "sets" : {
+            "rolenames" : "/users/503f17da-ec39-11e3-a0dd-a554b7fbd57a/roles",
+            "permissions" : "/users/503f17da-ec39-11e3-a0dd-a554b7fbd57a/permissions"
+          },
+          "collections" : {
+            "activities" : "/users/503f17da-ec39-11e3-a0dd-a554b7fbd57a/activities",
+            "devices" : "/users/503f17da-ec39-11e3-a0dd-a554b7fbd57a/devices",
+            "feed" : "/users/503f17da-ec39-11e3-a0dd-a554b7fbd57a/feed",
+            "groups" : "/users/503f17da-ec39-11e3-a0dd-a554b7fbd57a/groups",
+            "roles" : "/users/503f17da-ec39-11e3-a0dd-a554b7fbd57a/roles",
+            "following" : "/users/503f17da-ec39-11e3-a0dd-a554b7fbd57a/following",
+            "followers" : "/users/503f17da-ec39-11e3-a0dd-a554b7fbd57a/followers"
+          }
+        }
+      } ],
+      "timestamp" : 1401921673597,
+      "duration" : 12,
+      "organization" : "your-org",
+      "applicationName" : "your-app"
+    }
+
+## SDKs
+To make the integration of Usergrid features into your application code quicker and easier, Usegrid offers SDKs in a variety of languages. The SDKs contain language-specific methods that allow you to issue API requests from your application code in your preferred language. SDKs are available for the following languages:
+
+* iOS
+* Android
+* JavaScript/HTML5
+* Node.js
+* Ruby
+* .NET
+
+For more information, see SDKs.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/index.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/index.txt b/content/docs/_sources/index.txt
new file mode 100644
index 0000000..e25eebc
--- /dev/null
+++ b/content/docs/_sources/index.txt
@@ -0,0 +1,160 @@
+*****************************
+Apache Usergrid Documentation
+*****************************
+
+.. _intro::
+
+.. toctree::
+   :maxdepth: 2
+   :caption: Introduction
+
+   introduction/usergrid-features
+   introduction/data-model
+   introduction/async-vs-sync
+   
+.. _getting-started:
+
+.. toctree::
+   :maxdepth: 2
+   :caption: Getting Started
+
+   getting-started/creating-a-new-application
+   getting-started/creating-account
+   getting-started/using-a-sandbox-app
+   getting-started/using-the-api.md
+     
+.. _data-storage:
+
+.. toctree::
+   :maxdepth: 2
+   :caption: Data Storage
+   
+   data-storage/data-store-dbms
+   data-storage/optimizing-access
+   data-storage/collections
+   data-storage/entities
+
+.. _data-queries:
+
+.. toctree::
+   :maxdepth: 2
+   :caption: Data Queries 
+  
+   data-queries/querying-your-data
+   data-queries/query-parameters
+   data-queries/operators-and-types
+   data-queries/advanced-query-usage
+
+.. _entity-connections:
+
+.. toctree::
+   :maxdepth: 2
+   :caption: Entity Connections 
+  
+   entity-connections/connecting-entities
+   entity-connections/retrieving-entities
+   entity-connections/disconnecting-entities
+   
+.. _security-and-authentication:
+
+.. toctree::
+   :maxdepth: 2
+   :caption: Security & Authentication
+  
+   security-and-auth/app-security
+   security-and-auth/using-permissions
+   security-and-auth/authenticating-users-and-application-clients
+   security-and-auth/user-authentication-types
+   security-and-auth/changing-token-time-live-ttl
+   security-and-auth/authenticating-api-requests
+   security-and-auth/revoking-tokens-logout
+   security-and-auth/facebook-sign
+   security-and-auth/securing-your-app
+   
+.. _user-management-and-social-graph:
+
+.. toctree::
+   :maxdepth: 2
+   :caption: User Management & Social Graph
+  
+   user-management/user-management
+   user-management/working-user-data
+   user-management/group
+   user-management/activity
+   user-management/user-connections
+   user-management/messagee-example
+   
+.. _geolocation:
+
+.. toctree::
+   :maxdepth: 2
+   :caption: Geo-location
+   
+   geolocation/geolocation
+   
+.. _asset-and-file-management:
+
+.. toctree::
+   :maxdepth: 2
+   :caption: Assets & Files
+  
+   asset-and-files/uploading-assets.md
+   asset-and-files/retrieving-assets.md
+   asset-and-files/folders.md
+   
+.. _counters-and-events:
+
+.. toctree::
+   :maxdepth: 2
+   :caption: Counters & Events
+  
+   counters-and-events/events-and-counters
+   counters-and-events/creating-and-incrementing-counters
+   counters-and-events/retrieving-counters
+   
+.. _organization-and-application-management:
+
+.. toctree::
+   :maxdepth: 2
+   :caption: Organizations & Applications
+   
+   orgs-and-apps/managing
+   orgs-and-apps/organization
+   orgs-and-apps/application
+   orgs-and-apps/adminuser
+  
+.. _rest-endpoints:
+
+.. toctree::
+   :maxdepth: 0
+   :caption: API Reference
+
+   rest-endpoints/api-docs            
+         
+.. _sdks:
+
+.. toctree::
+   :maxdepth: 2
+   :caption: Client SDKs
+
+   sdks/tbd
+   
+.. _installation:
+
+.. toctree::
+   :maxdepth: 2
+   :caption: Installing the Stack
+
+   installation/ug1-deploy-to-tomcat
+   installation/ug1-launcher-quick-start
+   installation/ug2-deploy-to-tomcat
+    
+.. _about:
+
+.. toctree::
+   :maxdepth: 2
+   :caption: More about Usergrid
+
+   reference/presos-and-videos
+   reference/contribute-code       
+       

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/installation/ug1-deploy-to-tomcat.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/installation/ug1-deploy-to-tomcat.txt b/content/docs/_sources/installation/ug1-deploy-to-tomcat.txt
new file mode 100644
index 0000000..5356a94
--- /dev/null
+++ b/content/docs/_sources/installation/ug1-deploy-to-tomcat.txt
@@ -0,0 +1,179 @@
+# Usegrid 1: Deploying to Tomcat
+
+This is a guide that explains how to install and run Usergrid using stock Tomcat and Cassandra on a single computer.
+
+NOTE: running Cassandra on a single computer is something you should do ONLY for testing purposes. You don't want to run one node in production even just to start out. To get the benefit of Cassandra's architecture, which is designed to support linear scalability. You should be running a Cassandra cluster with at least three nodes. 
+
+For more information:
+
+* [Cassandra FAQ: Can I Start With a Single Node?](http://planetcassandra.org/blog/post/cassandra-faq-can-i-start-with-a-single-node/)
+* [Why don't you start off with a “single & small” Cassandra server](http://stackoverflow.com/questions/18462530/why-dont-you-start-off-with-a-single-small-cassandra-server-as-you-usually)
+
+## Requirements
+
+* [JDK 1.7](http://www.oracle.com/technetwork/java/javase/downloads/index.html)
+* [Maven](http://maven.apache.org/)
+
+## Download
+
+Use GitHub to clone the [apache/incubator-usergrid](https://github.com/apache/incubator-usergrid) repo.
+
+Or you can start by [downloading our latest code](https://github.com/apache/incubator-usergrid/archive/master.zip) and extract it.
+
+## Building
+
+From the command line, navigate to `stack` directory and type the following:
+
+    mvn clean package -DskipTests=true
+
+Once you are done the Usergrid application will be package as a Java EE WAR file at the location __stack/rest/target/ROOT.war__.
+
+Install and configure Cassandra
+---
+
+Install Cassandra, don't edit configuration files as we just want default values for this simple setup. Here are the [instructions for installing Cassandra](http://wiki.apache.org/cassandra/GettingStarted)
+
+Install and configure Tomcat
+---
+
+Follow instructions, don't edit configuration files as we just want default values for this simple setup. Here are the [instructions for installing Tomcat 7](http://tomcat.apache.org/tomcat-7.0-doc/setup.html)
+
+Add Usergrid WAR to Tomcat
+---
+
+Remove the existing `tomcat/webapps/ROOT` directory. 
+
+Place the Usergrid `ROOT.war` file into the `tomcat/webapps` directory
+
+Add Usergrid configuration file to Tomcat
+---
+
+Create a ____usergrid-custom.properties____ file and place it in Tomcat's __lib__ directory. You can find an example properties file below  that should work well for a local Tomcat & Cassandra setup. You will probably only need to change the properties below to use your email address and preferred password for the install.
+
+
+    usergrid.sysadmin.login.allowed=true
+    usergrid.sysadmin.login.name=superuser
+    usergrid.sysadmin.login.password=pw123
+    usergrid.sysadmin.email=me@example.com
+    usergrid.sysadmin.login.email=myself@example.com
+    usergrid.management.mailer=Myself<my...@example.com>
+    usergrid.test-account.admin-user.email=myself@example.com
+    usergrid.test-account.admin-user.password=test
+
+Run Usergrid Database & Super User Setup
+---
+
+Start Tomcat and use your web browser to visit the URLs below. While you do this you might want to watch the logs under tomcat/logs for clues, just in case anything goes wrong. 
+
+Database setup URL - [http://localhost:8080/system/database/setup](http://localhost:8080/system/database/setup)
+
+When prompted to login use the sysadmin credentials that you specified in your __usergrid-custom.properties__ file. Based on the example above that would be superuser and pw123. If the operation is successful you should a message like the one below in your browser. If not, check your logs for clues about what went wrong.
+
+    {
+      "action" : "cassandra setup",
+      "status" : "ok",
+      "timestamp" : 1379424622947,
+      "duration" : 76
+    }
+
+Superuser setup URL - [http://localhost:8080/system/superuser/setup](http://localhost:8080/system/superuser/setup)
+
+You should not be prompted for login because you already logged into for the Database Setup. If setup works, you should see a message like this:
+
+    {
+      "action" : "superuser setup",
+      "status" : "ok",
+      "timestamp" : 1379424667936,
+      "duration" : 2
+    }
+
+Build the Usergrid Console
+---
+The Usergrid Console is an admin interface written in JavaScript that connects to your running Usergrid instance. For evaluation purposes, you can run it within Tomcat. Build it by following the steps [here](https://github.com/apache/incubator-usergrid/blob/master/portal/README.md). Once built, copy the directory _portal/build/usergrid-portal_ to _tomcat/webapps_.
+
+
+Login to the Usergrid Console & get started
+---
+You should now be able to login to the Usergrid console and start configuring applications, users and more. 
+
+You can use an static version of the portal to get started:
+
+http://localhost:8080/usergrid-portal/(http://localhost:8080/usergrid-portal)
+
+
+Example __usergrid-custom.properties__ file
+---
+Here's a complete example properties file to get you started.
+
+    # Minimal Usergrid configuration properties for local Tomcat and Cassandra 
+    #
+    # The cassandra configuration options. 
+
+    # The cassandra host to use
+    cassandra.url=localhost:9160
+
+    # if your cassandra instance requires username/password
+    cassandra.username=someuser
+    cassandra.password=somepassword
+    
+    # The strategy to use when creating the keyspace. This is the default. 
+    # We recommend creating the keyspace with this default, then editing it 
+    # via the cassandra CLI to meet the client's needs.
+    cassandra.keyspace.strategy=org.apache.cassandra.locator.SimpleStrategy
+     
+    # The default replication factor for the simple strategy. Again, leave the 
+    # default, create the app, then use the cassandra cli to set the replication 
+    # factor options. This can become complicated with different topologies and 
+    # is more a Cassandra administration issue than a UG issue.
+    cassandra.keyspace.strategy.options.replication_factor=1
+     
+    ######################################################
+    # Custom mail transport. Not usually used for local testing
+
+    #mail.transport.protocol=smtps
+    #mail.smtps.host=email-smtp.us-east-1.amazonaws.com
+    #mail.smtps.port=465
+    #mail.smtps.auth=true
+    #mail.smtps.quitwait=false
+    #mail.smtps.username=
+    #mail.smtps.password=
+
+    ######################################################
+    # Admin and test user setup (change these to be their super user
+
+    usergrid.sysadmin.login.name=superuser
+    usergrid.sysadmin.login.email=myself@example.com     <--- Change this
+    usergrid.sysadmin.login.password=pw123               <--- Change this
+    usergrid.sysadmin.login.allowed=true
+    usergrid.sysadmin.email=myself@example.com           <--- Change this
+    
+    # Enable or disable this to require superadmin approval of users
+    usergrid.sysadmin.approve.users=false
+
+    ######################################################
+    # Auto-confirm and sign-up notifications settings
+
+    usergrid.management.admin_users_require_confirmation=false
+    usergrid.management.admin_users_require_activation=false
+    usergrid.management.organizations_require_activation=false
+    usergrid.management.notify_sysadmin_of_new_organizations=false
+    usergrid.management.notify_sysadmin_of_new_admin_users=false
+
+    ######################################################
+    # URLs
+    # Redirect path when request come in for TLD
+
+    usergrid.redirect_root=https://localhost:8080/status
+    usergrid.view.management.organizations.organization.activate=https://localhost:8080/accounts/welcome
+    usergrid.view.management.organizations.organization.confirm=https://localhost:8080/accounts/welcome
+    usergrid.view.management.users.user.activate=https://localhost:8080/accounts/welcome
+    usergrid.view.management.users.user.confirm=https://localhost:8080/accounts/welcome
+    usergrid.organization.activation.url=https://localhost:8080/management/organizations/%s/activate
+    usergrid.admin.activation.url=https://localhost:8080/management/users/%s/activate
+    usergrid.admin.resetpw.url=https://localhost:8080/management/users/%s/resetpw
+    usergrid.admin.confirmation.url=https://localhost:8080/management/users/%s/confirm
+    usergrid.user.activation.url=https://localhost:8080%s/%s/users/%s/activate
+    usergrid.user.confirmation.url=https://localhost:8080/%s/%s/users/%s/confirm
+    usergrid.user.resetpw.url=https://localhost:8080/%s/%s/users/%s/resetpw
+ 
+ 
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/installation/ug1-launcher-quick-start.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/installation/ug1-launcher-quick-start.txt b/content/docs/_sources/installation/ug1-launcher-quick-start.txt
new file mode 100644
index 0000000..8399522
--- /dev/null
+++ b/content/docs/_sources/installation/ug1-launcher-quick-start.txt
@@ -0,0 +1,72 @@
+# Usegrid 1: Launcher Quick-start
+
+## Requirements
+
+* [JDK 1.7](http://www.oracle.com/technetwork/java/javase/downloads/index.html)
+* [Maven](http://maven.apache.org/)
+
+## Download
+
+### Download2
+
+Start by [downloading our latest code](https://github.com/apache/incubator-usergrid/archive/master.zip) and extract it.
+
+#### Building 3
+
+From the command line, navigate to stack directory and type the following:
+
+    mvn clean install -DskipTests=true
+
+## Running
+
+Usergrid-core contains the persistence layer and shared utilities for powering the Usergrid service. The services layer is contained in usergrid-services and exposes a higher-level API that's used by the usergrid-rest web services tier.
+
+You can run Usergrid from the command-line from the
+jar in the usergrid/standalone project:
+
+    cd launcher; java -jar target/usergrid-launcher-*.jar
+
+After startup, your instance will be available on localhost, port 8080.
+To check it’s running properly, you can try loading our status page:
+
+    curl http://localhost:8080/status
+
+You can also run it as a webapp in Tomcat, by deploying the ROOT.war file generated in the usergrid/rest project.
+
+## Getting Started with the HTTP API
+
+Start by creating an Organization. It’s the top-level structure in Usergrid:
+all Apps and Administrators must belong to an Organization. Here’s how you create one:
+
+    curl -X POST  \
+         -d 'organization=myfirstorg&username=myadmin&name=Admin&email=admin@example.com&password=password' \
+         http://localhost:8080/management/organizations
+
+You can see that creating an Organization creates an Administrator in the process. Let’s authenticate as him:
+
+    curl 'http://localhost:8080/management/token?grant_type=password&username=myadmin&password=password'
+
+This will return an access\_token. We’ll use this to authenticate the next two calls.
+Next, let’s create an Application:
+
+    curl -H "Authorization: Bearer [the management token from above]" \
+         -H "Content-Type: application/json" \
+         -X POST -d '{ "name":"myapp" }' \
+         http://localhost:8080/management/orgs/myfirstorg/apps
+
+… And a User for the Application:
+
+    curl -H "Authorization: Bearer [the management token from above]" \
+         -X POST "http://localhost:8080/myfirstorg/myapp/users" \
+         -d '{ "username":"myuser", "password":"mypassword", "email":"user@example.com" }'
+
+Let’s now generate an access token for this Application User:
+
+    curl 'http://localhost:8080/myfirstorg/myapp/token?grant_type=password&username=myuser&password=mypassword'
+
+This will also send back an access\_token, but limited in scope.
+Let’s use it to create a collection with some data in it:
+
+    curl -H "Authorization: Bearer [the user token]" \
+         -X POST -d '[ { "cat":"fluffy" }, { "fish": { "gold":2, "oscar":1 } } ]' \
+         http://localhost:8080/myfirstorg/myapp/pets

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/installation/ug2-deploy-to-tomcat.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/installation/ug2-deploy-to-tomcat.txt b/content/docs/_sources/installation/ug2-deploy-to-tomcat.txt
new file mode 100644
index 0000000..10ed013
--- /dev/null
+++ b/content/docs/_sources/installation/ug2-deploy-to-tomcat.txt
@@ -0,0 +1,167 @@
+# Usergrid 2: Deploy to Tomcat
+
+__NOTE__: Beware that Usergrid 2 is UNRELEASED SOFTWARE
+
+## Requirements
+
+* [JDK 1.8](http://www.oracle.com/technetwork/java/javase/downloads/index.html)
+* [Maven 3.2+](http://maven.apache.org/)
+* [Tomcat 7+](https://tomcat.apache.org/download-70.cgi)
+* [Cassandra 1.2.1*](http://cassandra.apache.org/download/)
+* [ElasticSearch 1.4+](https://www.elastic.co/downloads/elasticsearch) 
+* [Usergrid 2.0](https://github.com/apache/incubator-usergrid/tree/two-dot-o)
+
+##Running
+
+
+1. Start up Cassandra [^1]
+	a. To do this you can navigate to the cassandra folder and run ```./bin/cassandra ```
+2. Start up Elasticsearch
+	a. To do this you can navigate to the folder where you extracted elasticsearch and run ```/bin/elasticsearch``` 	
+
+###Running Usergrid	
+
+####Build The Java Sdk
+
+1. Navigate to where you cloned the usergrid repo
+2. Navigate to the ```sdks/java``` directory
+3. Run ```mvn clean install```
+
+####Build The Stack Itself
+
+1. Navigate to the ```stack``` directory.
+2. Run ```mvn clean install -DskipTests```
+3. This will generate a war at ```rest/target/ROOT.war```
+
+####Deploying the Stack Locally
+1. Take this war and deploy it on downloaded tomcat.
+1. In the lib directory of the tomcat you must also put usergrid-deployment.properties. ( An example file is provided below)
+1. Start up Tomcat
+	a. To do this you can navigate to folder where Tomcat is install and run ```./bin/catalina.sh start```
+1. Go to a web browser and input the following to initilizing the database ```localhost:8080/system/database/setup```. 
+	a. The credentials it asks for are the admin credentialls and password as defined in the usergrid-deployment.properties. 
+	b. You can also do a curl call with basic auth to automatically authenticate the call instead of using the web browser.
+1. Then using the same steps as before call ```localhost:8080/system/superuser/setup```
+
+The stack is now ready to be queried against, but to get the most out of it you'll need to initilize and use our portal!
+
+####Running The Portal Locally
+#####Requirments 
+[nodejs 0.10+](https://nodejs.org/download/) 
+
+1. Make sure you've installed node.js above. Any version above .10 or .10 should work fine.
+2. Navigate to ```incubator-usergrid/portal```.
+3. Open config.js and make sure the override URL is pointing to your local tomcat.
+4. Now in the portal folder run the following command ```./build.sh dev``` 
+5. The portal should automatically open ready for use!
+
+Now usergrid is fully ready to use! Feel free to query against it or use it however you like!
+
+
+
+Example __usergrid-deployment.properties__ file
+---
+```
+# core persistence properties
+
+cassandra.embedded=false
+cassandra.version=1.2.18
+cassandra.timeout=2000
+
+collections.keyspace=Usergrid_Applications
+collections.keyspace.strategy.options=replication_factor:1
+collections.keyspace.strategy.class=org.apache.cassandra.locator.SimpleStrategy
+
+collection.stage.transient.timeout=60
+
+hystrix.threadpool.graph_user.coreSize=40
+hystrix.threadpool.graph_async.coreSize=40
+
+elasticsearch.embedded=false
+elasticsearch.cluster_name=elasticsearch
+elasticsearch.index_prefix=usergrid
+elasticsearch.hosts=127.0.0.1
+elasticsearch.port=9300
+
+elasticsearch.force_refresh=true
+
+index.query.limit.default=100
+
+# Max Cassandra connections, applies to both CP and EM
+cassandra.connections=600
+
+######################################################
+# Minimal Usergrid configuration properties for local Tomcat and Cassandra 
+#
+
+cassandra.url=127.0.0.1:9160
+
+cassandra.keyspace.strategy=org.apache.cassandra.locator.SimpleStrategy
+cassandra.keyspace.strategy.options.replication_factor=1
+
+######################################################
+# Custom mail transport 
+
+mail.transport.protocol=smtps
+mail.smtps.host=smtp.gmail.com
+mail.smtps.port=465
+mail.smtps.auth=true
+mail.smtps.username=
+mail.smtps.password=
+mail.smtps.quitwait=false
+
+
+######################################################
+# Admin and test user setup
+
+usergrid.sysadmin.login.name=superuser
+usergrid.sysadmin.login.email=myself@example.com     <--- Change this
+usergrid.sysadmin.login.password=pwHERE               <--- Change this
+usergrid.sysadmin.login.allowed=true
+usergrid.sysadmin.email=myself@example.com           <--- Change this
+
+usergrid.sysadmin.approve.users=false
+usergrid.sysadmin.approve.organizations=false
+
+# Base mailer account - default for all outgoing messages
+usergrid.management.mailer=User <my...@example.com>    <--- Change this
+
+usergrid.setup-test-account=true
+
+usergrid.test-account.app=test-app
+usergrid.test-account.organization=test-organization
+usergrid.test-account.admin-user.username=test
+usergrid.test-account.admin-user.name=Test User
+usergrid.test-account.admin-user.email=myself@example.com    <---Change this
+usergrid.test-account.admin-user.password=test
+
+######################################################
+# Auto-confirm and sign-up notifications settings
+
+usergrid.management.admin_users_require_confirmation=false
+usergrid.management.admin_users_require_activation=false
+
+usergrid.management.organizations_require_activation=false
+usergrid.management.notify_sysadmin_of_new_organizations=true
+usergrid.management.notify_sysadmin_of_new_admin_users=true
+######################################################
+# URLs
+
+# Redirect path when request come in for TLD
+usergrid.redirect_root=http://localhost:8080/status
+
+usergrid.view.management.organizations.organization.activate=http://localhost:8080/accounts/welcome
+usergrid.view.management.organizations.organization.confirm=http://localhost:8080/accounts/welcome
+usergrid.view.management.users.user.activate=http://localhost:8080/accounts/welcome
+usergrid.view.management.users.user.confirm=http://localhost:8080/accounts/welcome
+
+usergrid.organization.activation.url=http://localhost:8080/management/organizations/%s/activate
+usergrid.admin.activation.url=http://localhost:8080/management/users/%s/activate
+usergrid.admin.resetpw.url=http://localhost:8080/management/users/%s/resetpw
+usergrid.admin.confirmation.url=http://localhost:8080/management/users/%s/confirm
+usergrid.user.activation.url=http://localhost:8080%s/%s/users/%s/activate
+usergrid.user.confirmation.url=http://localhost:8080/%s/%s/users/%s/confirm
+usergrid.user.resetpw.url=http://localhost:8080/%s/%s/users/%s/resetpw
+``` 
+
+[^1]: You can start up cassandra and elasticsearch in any order but for the sake of ordered lists I put Cassandra first. 
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/introduction/async-vs-sync.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/introduction/async-vs-sync.txt b/content/docs/_sources/introduction/async-vs-sync.txt
new file mode 100644
index 0000000..fe1f721
--- /dev/null
+++ b/content/docs/_sources/introduction/async-vs-sync.txt
@@ -0,0 +1,25 @@
+# Async vs. sync calls
+The Usergrid SDKs work by making RESTful API calls from your application to the API. In some cases, both synchronous and asynchronous calls are supported for most methods, as in the case of the Usergrid Android SDK, while in others only asynchronous calls are supported, as in the Usergrid JavaScript SDK. The following is a brief explanation of synchronous vs. asynchronous API calls.
+
+## Synchronous
+If an API call is synchronous, it means that code execution will block (or wait) for the API call to return before continuing. This means that until a response is returned by the API, your application will not execute any further, which could be perceived by the user as latency or performance lag in your app. Making an API call synchronously can be beneficial, however, if there if code in your app that will only execute properly once the API response is received.
+
+## Asynchronous
+Asynchronous calls do not block (or wait) for the API call to return from the server. Execution continues on in your program, and when the call returns from the server, a "callback" function is executed. For example, in the following code using the Usergrid JavScript SDK, the function called dogCreateCallback will be called when the create dog API call returns from the server. Meanwhile, execution will continue:
+
+    function dogCreateCallback(err, dog) {
+        alert('I will probably be called second');
+        if (err) {
+            //Error - Dog not created
+        } else {
+            //Success - Dog was created
+
+        }
+    }
+
+    client.createEntity({type:'dogs'}, dogCreateCallback);
+    alert('I will probably be called first');
+    
+The result of this is that we cannot guarantee the order of the two alert statements. Most likely, the alert right after the createEntity function call will be called first since the API call will take a second or so to complete.
+
+The important point is that program execution will continue, and asynchronously, the callback function will be called once program execution completes.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/introduction/data-model.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/introduction/data-model.txt b/content/docs/_sources/introduction/data-model.txt
new file mode 100644
index 0000000..0278b97
--- /dev/null
+++ b/content/docs/_sources/introduction/data-model.txt
@@ -0,0 +1,76 @@
+# Usergrid Data model
+
+Usergrid models the data for your apps as application-specific collections of data entities managed within an organization. The following is an overview of the component hierarchy that makes up the data model, and is intended to help you understand how data is stored, managed and accessed.
+
+## Organizations
+An organization contains one or more applications, and represents administrator-level access. Multiple accounts may be given administrator access to an organization. Accounts can also be members of multiple organizations.
+
+An organization with the same name as your username is automatically created for you when you sign up. By default, you are assigned as the administrator of this organization.
+
+## Applications
+In Usergrid, you can create one or more applications within an organization. Applications represent an instance of application data associated with an app, and you may create as many applications as you wish. This allows you to utilize the backend in a way that corresponds to your development process. For example, you might create separate applications for development and production instances of your app. By default, all organization have a sandbox application (see Using a Sandbox Application for important information regarding the default sandbox application).
+
+Each application provides the infrastructure for storing, retrieving, updating and deleting the entities and collections associated with a specific app instance.
+
+## Collections
+Usergrid stores all data entities in uniquely-named collections. Collections are created automatically for every entity type, including custom entities, and are named using the plural form of the entity type they store. For example, all user entities are stored in the /users collection, and all device entities in the /devices collection. An entity can belong to only one collection.
+
+Currently, collections cannot be renamed or deleted; however, all of the data entities in a collection can be updated or deleted.
+
+## Entities
+An entity represents a basic, JSON-formatted data object that is used by your app, such as a user, device, event or asset. Unlike records in conventional database tables, which have a rigid schema that defines what they can store and how they can be related to each other, Usergrid entities are very flexible. This makes Usergrid a powerful solution for managing data for modern applications, where people, places, and content often need to be associated in a way that is most appropriate from a user perspective.
+
+Here is a simple example of an entity:
+
+    {
+      "uuid" : "5c0c1789-d503-11e1-b36a-12313b01d5c1",
+      "type" : "user",
+      "created" : 1343074620374,
+      "modified" : 1355442681264,
+      "username" : "john.doe",
+      "email" : "jdoe57@mail.com",
+      "name" : "John Doe"
+    }
+    
+## Default entities
+The following entity types are predefined in Usergrid. For more details, see Default Data Entity Types.
+
+* user
+* group
+* role
+* application
+* activity
+* device
+* asset
+* folder
+* event
+* notifier
+* notification
+* receipt
+
+## Properties
+
+A data entity is a set of properties, which can each contain any JSON-representable value, including a nested JSON document. All entities have predefined properties, but you are free to define any number of custom properties for any entity. Default properties require specific data types for validation purposes, while custom properties can be any JSON data type. Most predefined and all application-defined entity properties are indexed, allowing you to query collections quickly and easily.
+
+Individual or multiple properties can be updated in a single operation; however, partial updating of nested JSON documents is not supported. This means that all properties of a nested document must be provided in a PUT request for the update of the nested document to be processed, even if the some of the values have not changed.
+
+## Default properties
+At a minimum, each entity is defined by two properties, both of which are strings: type and UUID. The entity 'type' is the singular form of the collection the entity is stored in. For example, an entity in the 'users' collection has an entity type of 'user'. The entity 'UUID' is an immutable universally unique identifier, which can be used to reference the entity. A UUID is automatically generated for every entity when it is created. You can also create custom entities and entity properties; however, Usergrid reserves certain entity types with pre-defined properties by default. For a complete list of reserved entities and properties, see Default Data Entity Types.
+
+When you access the system via the API, you’ll always provide your organization UUID or name, application UUID or name, and typically the UUID or name of the entity you’re modifying or retrieving.
+
+All entities have the following default properties:
+
++------------+--------+---------------------------------------------------------------------+
+| Property   | Type   | Description                                                         |
++------------+--------+---------------------------------------------------------------------+
+| uuid       | UUID   | Entity unique id                                                    |
++------------+--------+---------------------------------------------------------------------+
+| type       | string | entity type (for example, user)                                     |
++------------+--------+---------------------------------------------------------------------+
+| created    | long   | UTC timestamp in milliseconds of when the entity was created        |
++------------+--------+---------------------------------------------------------------------+
+| modified   | long   | UTC timestamp in milliseconds of when the entity was last modified  |
++------------+--------+---------------------------------------------------------------------+
+
+Custom entities also have an optional name property that is a string identifier.

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/introduction/usergrid-features.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/introduction/usergrid-features.txt b/content/docs/_sources/introduction/usergrid-features.txt
new file mode 100644
index 0000000..5e57071
--- /dev/null
+++ b/content/docs/_sources/introduction/usergrid-features.txt
@@ -0,0 +1,81 @@
+# Usergrid Features
+
+Usergrid provides developers with access to a flexible data store and enables you to quickly integrate valuable features into your app, including social graphs, user management, data storage, push notifications, performance monitoring, and more.
+
+With Usergrid, developers can set up their own cloud-based data platform in minutes instead of months – no server-side coding or back-end development needed. This allows your developers to focus on developing the rich features and user experience that truly differentiate your app, rather than on the time-consuming details of implementing core back-end services and infrastructure.
+
+## Data storage & management
+
+### Application data
+
+At the core of Usergrid is a flexible platform that can store any type of application data, from simple records like a catalog of books to complex associations like user relationships. No matter what type of data drives your app, you can store it as collections of data entities and immediately perform complex queries or full-text searches on any field. You can also create custom entities with custom properties, giving you the ability to store data and context in a way that makes sense for your app.
+
+To learn more about entities and collections, see Usergrid Data model.
+
+For a complete list of the default data entities available, see Default Data Entity Types.
+
+### Files & assets
+
+Images, video, and audio are key components of a great app experience. With Usergrid, you can upload and retrieve binary objects from the same data store as the rest of your application data, eliminating the need to set up content delivery networks (CDNs) and easing implementation. We handle all the back-end details that keep your content quickly accessible.
+
+To learn more about files and asset storage, see Uploading files and assets .
+
+## Flexible data querying
+
+One of Usergrid' most powerful features is the ability to perform SQL-style queries and full-text searches on data entities, as well as their properties. This lets you quickly retrieve specific data entities based on multiple criteria, then utilize that data to power social features, target push notifications, perform user analysis, and more.
+
+Learn more about querying app data, see Data query overview.
+
+## Social
+
+### Entity relationships
+
+You can create relationships between data entities to help build features, improve user experience, and contextualize data. For example, you might associate a user with their devices to capture valuable geolocation data, create relationships between users to build social graphs, or implement popular features such as activity streams.
+
+To learn more about entity relationships, see Entity connections.
+
+### Activity streams
+
+A key aspect of social networking apps is the ability to provide and publish data streams of user actions, such as ongoing lists of comments, activities, and tweets. Usergrid simplifies management and routing of these data streams by providing an activity entity that is specifically designed to automatically create a relationship between activities and the user who created them.
+
+To learn more about activities and activity feeds, see Activity feeds.
+
+## User management
+
+### Registration and login
+
+You can easily add and manage users by providing the core services necessary to handle secure registration and log in, including OAuth 2.0-compliant client authentication. In addition, any number of default or custom data entities and properties can be associated with a user entity to create complete user profiles.
+
+To learn more about user management, see User.
+
+To learn more about authentication, see Authenticating users and application clients.
+
+### Roles & permissions
+
+Applications often require the ability to configure fine-grain control of user access to data, features and functionality. Usergrid solves the implementation details of user access with roles and permissions. Simply create roles that represent user types or access levels, such as Administrator, then assign the necessary permissions to that role. With a single API call, you can then associate your roles with any user or group of users.
+
+To learn more about user roles and permissions, see Managing access by defining permission rules.
+
+### Groups
+
+Groups are a flexible way to organize your users based on any number of criteria. For example, you might group users based on interests or location to more effectively deliver relevant content, target offers, or customize campaigns. You can also take advantage of the groups entity to enable group-based social networking activities, such as allowing your users to create private information feeds or circles of friends.
+
+To learn more about groups, see Working with group data.
+
+### Third-party authentication
+
+In addition to supporting user management and OAuth-based login for your app, Usergrid also makes it easy to integrate third-party authentication through such popular services as Facebook, Twitter and other OAuth-enabled accounts. Providing third-party sign-in can improve user experience, while increasing adoption, giving you access to valuable information from social networks and services.
+
+To learn more about using third-party sign-in, see Facebook sign in.
+
+## Geolocation
+
+The device entity allows you to capture geolocation data from your users' GPS-enabled devices to more effectively target campaigns, push notifications, offers and more. Geolocation also gives you an important data point for contextualizing and analyzing trends and user behavior.
+
+To learn more about geolocation, see Geolocation.
+
+## Push notifications
+
+Push notifications are the most effective way to engage your users with relevant content, and thanks to Usergrid, implementing them can be done in minutes. Simply register your app and your user's devices with a notification provider, such as Apple Push Notification Service or Google Cloud Messaging, then use the Usergrid notification entity to send millions of push notifications a month at no cost. When used in conjunction with queries of user and application data, push notifications become a powerful tool for leveraging user data, ensuring relevancy and driving engagement.
+
+To learn more about push notifications, see Push notifications overview.

[08/60] [abbrv] incubator-usergrid git commit: cherry picking docs from master

[sn...@apache.org]

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/security-and-auth/authenticating-users-and-application-clients.html
----------------------------------------------------------------------
diff --git a/content/docs/security-and-auth/authenticating-users-and-application-clients.html b/content/docs/security-and-auth/authenticating-users-and-application-clients.html
new file mode 100644
index 0000000..7e1348f
--- /dev/null
+++ b/content/docs/security-and-auth/authenticating-users-and-application-clients.html
@@ -0,0 +1,528 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>Authenticating users &amp; app clients &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+        <link rel="next" title="Authentication levels" href="user-authentication-types.html"/>
+        <link rel="prev" title="Using permissions" href="using-permissions.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">Authenticating users &amp; app clients</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#authentication-levels">Authentication levels</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#application-user-authentication-user-login">Application user authentication (user login)</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#using-the-sdks">Using the SDKs</a><ul>
+<li class="toctree-l4"><a class="reference internal" href="#request-syntax">Request syntax</a></li>
+<li class="toctree-l4"><a class="reference internal" href="#example-request">Example request</a></li>
+<li class="toctree-l4"><a class="reference internal" href="#example-response">Example response</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#application-client-authentication">Application client authentication</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#id1">Request syntax</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id2">Example request</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id3">Example response</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#admin-user-authentication">Admin user authentication</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#id4">Request syntax</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id5">Example Request</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id6">Example response</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#organization-client-authentication">Organization client authentication</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#id7">Request syntax</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id8">Example request</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id9">Example response</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>Authenticating users &amp; app clients</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/security-and-auth/authenticating-users-and-application-clients.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="authenticating-users-app-clients">
+<h1>Authenticating users &amp; app clients<a class="headerlink" href="#authenticating-users-app-clients" title="Permalink to this headline">¶</a></h1>
+<p>To protect your Usergrid application data, one of the steps you&#8217;ll take
+is to authenticate your app&#8217;s users. By ensuring that they are who they
+say they are, you can help ensure that your application&#8217;s data is
+available in secure ways. After you&#8217;ve created permission rules that
+define access to your application and have associated these rules with
+users, you&#8217;ll want to add code that authenticates your user, as
+described in this topic.</p>
+<div class="admonition note"> <p class="first admonition-title"><p>Note</p>
+  </p> <p class="last">
+
+
+You manage access to your application's data by creating permission<p>rules that govern which users can do what. Users authenticated as
+Application User have access according to these rules. For more about
+managing permissions, see <a class="reference external" href="using-permissions.html">Using
+Permissions</a>.</p>
+</p></div><div class="section" id="authentication-levels">
+<h2>Authentication levels<a class="headerlink" href="#authentication-levels" title="Permalink to this headline">¶</a></h2>
+<p>Usergrid supports four levels of authentication:</p>
+<ul class="simple">
+<li><strong>Application user</strong>: Grant&#8217;s user access to an API Services
+application, based on the roles and permissions assigned to the user.</li>
+<li><strong>Application client</strong>: Grants full access to perform API requests
+against an API Services application.</li>
+<li><strong>Organization client</strong>: Grants full access to perform API requests
+against an API Services organization.</li>
+<li><strong>Admin user</strong>: Grants full access to perform API requests against
+any API Services organization that the user is an admin of.</li>
+</ul>
+<p>Because the scope of access provided by the application client,
+organization client, and admin user authentication levels is so broad
+(and as a result, so powerful), it&#8217;s a bad practice to use them from a
+mobile app or any client-side code. Instead, they&#8217;re better suited to
+server-side implementations, such as web applications.</p>
+<p>For a more detailed description of available authentication levels, see
+<a class="reference external" href="user-authentication-types.html">Authentication levels</a>.</p>
+</div>
+<div class="section" id="application-user-authentication-user-login">
+<h2>Application user authentication (user login)<a class="headerlink" href="#application-user-authentication-user-login" title="Permalink to this headline">¶</a></h2>
+<p>Using the username and password values specified when the user entity
+was created, your app can connect to the Usergrid application endpoint
+to request an access token. It&#8217;s also acceptable to use the user&#8217;s email
+address in place of the username.</p>
+<div class="section" id="using-the-sdks">
+<h3>Using the SDKs<a class="headerlink" href="#using-the-sdks" title="Permalink to this headline">¶</a></h3>
+<p>When a user is logged in using the Usergrid iOS, JavaScript, node.JS and
+Android SDKs, the returned token is automatically stored in the
+UsergridDataClient (iOS), DataClient (Android), or Usergrid.Client
+(JavaScript/node.JS) class instance, and will be sent to the API with
+all subsequent method calls.</p>
+<div class="section" id="request-syntax">
+<h4>Request syntax<a class="headerlink" href="#request-syntax" title="Permalink to this headline">¶</a></h4>
+<div class="highlight-python"><div class="highlight"><pre>curl -X POST &quot;https://api.usergrid.com/&lt;orgName&gt;/&lt;appName&gt;/token&quot; -d &#39;{&quot;grant_type&quot;:&quot;password&quot;, &quot;username&quot;:&lt;username&gt;, &quot;password&quot;:&lt;password&gt;}&#39;
+</pre></div>
+</div>
+</div>
+<div class="section" id="example-request">
+<h4>Example request<a class="headerlink" href="#example-request" title="Permalink to this headline">¶</a></h4>
+<div class="highlight-python"><div class="highlight"><pre>curl -X POST &quot;https://api.usergrid.com/my-org/my-app/token&quot; -d &#39;{&quot;grant_type&quot;:&quot;password&quot;, &quot;username&quot;:&quot;john.doe&quot;, &quot;password&quot;:&quot;testpw&quot;}&#39;
+</pre></div>
+</div>
+</div>
+<div class="section" id="example-response">
+<h4>Example response<a class="headerlink" href="#example-response" title="Permalink to this headline">¶</a></h4>
+<p>The results include the access token needed to make subsequent API
+requests on behalf of the application user:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+<span class="s">&quot;access_token&quot;</span><span class="p">:</span> <span class="s">&quot;5wuGd-lcEeCUBwBQVsAACA:F8zeMOlcEeCUBwBQVsAACA:YXU6AAABMq0hdy4&quot;</span><span class="p">,</span>
+<span class="s">&quot;expires_in&quot;</span><span class="p">:</span> <span class="mi">3600</span><span class="p">,</span>
+    <span class="s">&quot;user&quot;</span><span class="p">:</span> <span class="p">{</span>
+        <span class="o">...</span>
+    <span class="p">}</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+</div>
+</div>
+<div class="section" id="application-client-authentication">
+<h2>Application client authentication<a class="headerlink" href="#application-client-authentication" title="Permalink to this headline">¶</a></h2>
+<p>Using your app’s client id and client secret values, your app can
+connect to the Usergrid application endpoint to request an access token.
+The client ID and secret for your app can be found in &#8216;Getting Started&#8217;
+section of the API Services admin portal, under &#8216;Server App
+Credentials&#8217;.</p>
+<div class="admonition warning"> <p class="first admonition-title"><p>WARNING</p>
+  </p> <p class="last">
+
+
+Warning: You should never authenticate this way from a client-side app<p>such as a mobile app. A hacker could analyze your app and extract the
+credentials for malicious use even if those credentials are compiled and
+in binary format. See &#8220;safe mobile access&#8221; in <a class="reference external" href="authenticating-api-requests.html">Authenticating API
+requests</a> for additional
+considerations in keeping access to your app and its data secure.</p>
+</p></div><div class="section" id="id1">
+<h3>Request syntax<a class="headerlink" href="#id1" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X POST &quot;https://api.usergrid.com/&lt;orgName&gt;/&lt;appName&gt;/token&quot; -d &#39;{&quot;grant_type&quot;:&quot;client_credentials&quot;, &quot;client_id&quot;:&lt;application_clientID&gt;, &quot;client_secret&quot;:&quot;&lt;application_client_secret&gt;&quot;}&#39;
+</pre></div>
+</div>
+</div>
+<div class="section" id="id2">
+<h3>Example request<a class="headerlink" href="#id2" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X POST &quot;https://api.usergrid.com/my-org/my-app/token&quot; -d &#39;{&quot;grant_type&quot;:&quot;client_credentials&quot;, &quot;client_id&quot;:&quot;YXB7NAD7EM0MEeJ989xIxPRxEkQ&quot;, &quot;client_secret&quot;:&quot;YXB7NAUtV9krhhMr8YCw0QbOZH2pxEf&quot;}&#39;
+</pre></div>
+</div>
+</div>
+<div class="section" id="id3">
+<h3>Example response<a class="headerlink" href="#id3" title="Permalink to this headline">¶</a></h3>
+<p>The results include the access token needed to make subsequent API
+requests on behalf of the application:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+    <span class="s">&quot;access_token&quot;</span><span class="p">:</span> <span class="s">&quot;F8zeMOlcEeCUBwBQVsAACA:YXA6AAABMq0d4Mep_UgbZA0-sOJRe5yWlkq7JrDCkA&quot;</span><span class="p">,</span>
+    <span class="s">&quot;expires_in&quot;</span><span class="p">:</span> <span class="mi">3600</span><span class="p">,</span>
+    <span class="s">&quot;application&quot;</span><span class="p">:</span> <span class="p">{</span>
+        <span class="o">...</span>
+    <span class="p">}</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+</div>
+<div class="section" id="admin-user-authentication">
+<h2>Admin user authentication<a class="headerlink" href="#admin-user-authentication" title="Permalink to this headline">¶</a></h2>
+<p>If you do require admin user access, your app can connect to the
+Usergrid management endpoint to request an access token. Your app
+supplies the username and password of an admin user in the request.</p>
+<div class="admonition warning"> <p class="first admonition-title"><p>WARNING</p>
+  </p> <p class="last">
+
+
+Warning: Authenticating as an admin user grants full access to one or<p>more organizations and all of the applications contained in those
+organizations. Due to this, be cautious when implementing this type of
+authentication in client-side code. Instead, consider implementing admin
+user access in server-side code only. See &#8220;safe mobile access&#8221; in
+<a class="reference external" href="authenticating-api-requests.html">Authenticating API requests</a> for
+additional considerations in keeping access to your app and its data
+secure.</p>
+</p></div><div class="section" id="id4">
+<h3>Request syntax<a class="headerlink" href="#id4" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X POST &quot;https://api.usergrid.com/management/token&quot; -d &#39;{&quot;grant_type&quot;:&quot;password&quot;, &quot;username&quot;:&lt;admin_username&gt;, &quot;password&quot;:&lt;admin_password&gt;}&#39;
+</pre></div>
+</div>
+</div>
+<div class="section" id="id5">
+<h3>Example Request<a class="headerlink" href="#id5" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X POST &quot;https://api.usergrid.com/management/token&quot;  -d &#39;{&quot;grant_type&quot;:&quot;password&quot;, &quot;username&quot;:&quot;testadmin&quot;, &quot;password&quot;:&quot;testadminpw&quot;}&#39;
+</pre></div>
+</div>
+</div>
+<div class="section" id="id6">
+<h3>Example response<a class="headerlink" href="#id6" title="Permalink to this headline">¶</a></h3>
+<p>The results include the access token needed to make subsequent API
+requests on behalf of the admin user:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+    <span class="s">&quot;access_token&quot;</span><span class="p">:</span> <span class="s">&quot;f_GUbelXEeCfRgBQVsAACA:YWQ6AAABMqz_xUyYeErOkKjnzN7YQXXlpgmL69fvaA&quot;</span><span class="p">,</span>
+    <span class="s">&quot;expires_in&quot;</span><span class="p">:</span> <span class="mi">3600</span><span class="p">,</span>
+    <span class="s">&quot;user&quot;</span><span class="p">:</span> <span class="p">{</span>
+        <span class="o">...</span>
+    <span class="p">}</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+</div>
+<div class="section" id="organization-client-authentication">
+<h2>Organization client authentication<a class="headerlink" href="#organization-client-authentication" title="Permalink to this headline">¶</a></h2>
+<p>If you do require organization level access, your app can connect to the
+Usergrid management endpoint to request an access token. Access to an
+organization requires the client id and client secret credentials. The
+client ID and secret for your organization can be found on the &#8216;Org
+Administration&#8217; page of the API Services admin console under
+&#8216;Organization API Credentials&#8217;.</p>
+<div class="admonition warning"> <p class="first admonition-title"><p>WARNING</p>
+  </p> <p class="last">
+
+
+Warning: You should never authenticate this way from a client-side app<p>such as a mobile app. A hacker could analyze your app and extract the
+credentials for malicious use even if those credentials are compiled and
+in binary format. See &#8220;safe mobile access&#8221; in [Authenticating API
+requests](authenticating-api-requests.html for additional considerations
+in keeping access to your app and its data secure.</p>
+</p></div><div class="section" id="id7">
+<h3>Request syntax<a class="headerlink" href="#id7" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X POST &quot;https://api.usergrid.com/management/token&quot; -d &#39;{&quot;grant_type&quot;:&quot;client_credentials&quot;, &quot;client_id&quot;:&lt;org_clientID&gt;, &quot;client_secret&quot;:&lt;org_client_secret&gt;}&#39;
+</pre></div>
+</div>
+</div>
+<div class="section" id="id8">
+<h3>Example request<a class="headerlink" href="#id8" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X POST &quot;https://api.usergrid.com/management/token&quot; -d &#39;{&quot;grant_type&quot;:&quot;client_credentials&quot;, &quot;client_id&quot;:&quot;YXB7NAD7EM0MEeJ989xIxPRxEkQ&quot;, &quot;client_secret&quot;:&quot;YXB7NAUtV9krhhMr8YCw0QbOZH2pxEf&quot;}&#39;
+</pre></div>
+</div>
+</div>
+<div class="section" id="id9">
+<h3>Example response<a class="headerlink" href="#id9" title="Permalink to this headline">¶</a></h3>
+<p>The results include the access token needed to make subsequent API
+requests to the organization:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+    <span class="s">&quot;access_token&quot;</span><span class="p">:</span> <span class="s">&quot;gAuFEOlXEeCfRgBQVsAACA:b3U6AAABMqz-Cn0wtDxxkxmQLgZvTMubcP20FulCZQ&quot;</span><span class="p">,</span>
+    <span class="s">&quot;expires_in&quot;</span><span class="p">:</span> <span class="mi">3600</span><span class="p">,</span>
+    <span class="s">&quot;organization&quot;</span><span class="p">:</span> <span class="p">{</span>
+        <span class="o">...</span>
+    <span class="p">}</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+</div>
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+      
+        <a href="user-authentication-types.html" class="btn btn-neutral float-right" title="Authentication levels" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+      
+      
+        <a href="using-permissions.html" class="btn btn-neutral" title="Using permissions" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+      
+    </div>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/security-and-auth/changing-token-time-live-ttl.html
----------------------------------------------------------------------
diff --git a/content/docs/security-and-auth/changing-token-time-live-ttl.html b/content/docs/security-and-auth/changing-token-time-live-ttl.html
new file mode 100644
index 0000000..bacf227
--- /dev/null
+++ b/content/docs/security-and-auth/changing-token-time-live-ttl.html
@@ -0,0 +1,389 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>Changing token expiration (time-to-live) &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+        <link rel="next" title="Authenticating API requests" href="authenticating-api-requests.html"/>
+        <link rel="prev" title="Authentication levels" href="user-authentication-types.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">Changing token expiration (time-to-live)</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#default-ttl">Default ttl</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#changing-the-default-ttl">Changing the default ttl</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#request-syntax">Request syntax</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#example-request">Example Request</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#example-response">Example response</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#changing-ttl-when-a-token-is-created">Changing ttl when a token is created</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>Changing token expiration (time-to-live)</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/security-and-auth/changing-token-time-live-ttl.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="changing-token-expiration-time-to-live">
+<h1>Changing token expiration (time-to-live)<a class="headerlink" href="#changing-token-expiration-time-to-live" title="Permalink to this headline">¶</a></h1>
+<p>An access token has a “time-to-live” (ttl), which is the maximum time
+that the access token will be valid for use within the application. With
+the Usergrid, you can change the default ttl for all application user
+tokens, set the ttl for an individual token at the time of creation, or
+revoke one or more tokens. This gives you a high degree of control over
+access to your Usergrid account and data store.</p>
+<div class="section" id="default-ttl">
+<h2>Default ttl<a class="headerlink" href="#default-ttl" title="Permalink to this headline">¶</a></h2>
+<p>By default, all tokens have a system-defined time-to-live of 7 days
+(604800 seconds). Note that Token ttl is specified in milliseconds, but
+when a token is created, the API response will return the ttl in
+seconds.</p>
+</div>
+<div class="section" id="changing-the-default-ttl">
+<h2>Changing the default ttl<a class="headerlink" href="#changing-the-default-ttl" title="Permalink to this headline">¶</a></h2>
+<p>You can change the default ttl for all application user tokens (that is,
+tokens associated with a user entity) by updating the application
+entity’s accesstokenttl property. Changing the default ttl will only
+affect new tokens. Any existing tokens will not be affected.</p>
+<p>Please note that this does not apply to application client, organization
+client or admin user tokens. For more on obtaining tokens for these
+other authorization levels, see <a class="reference external" href="authenticating-users-and-application-clients.html">Authenticating users and application
+clients</a>.</p>
+<p><strong>Note</strong>: If you set ttl=0, the token will never expire. This can pose a
+security risk and should be used with caution.</p>
+<div class="section" id="request-syntax">
+<h3>Request syntax<a class="headerlink" href="#request-syntax" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X PUT https://api.usergrid.com/&lt;org_name&gt;/&lt;app_name&gt; -d &#39;{&quot;accesstokenttl&quot;:&lt;ttl_in_milliseconds&gt;}&#39;
+</pre></div>
+</div>
+</div>
+<div class="section" id="example-request">
+<h3>Example Request<a class="headerlink" href="#example-request" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X PUT https://api.usergrid.com/your-org/your-app -d &#39;{&quot;accesstokenttl&quot;:&quot;1800000&quot;}&#39;
+</pre></div>
+</div>
+</div>
+<div class="section" id="example-response">
+<h3>Example response<a class="headerlink" href="#example-response" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+  <span class="s">&quot;action&quot;</span> <span class="p">:</span> <span class="s">&quot;put&quot;</span><span class="p">,</span>
+  <span class="s">&quot;application&quot;</span> <span class="p">:</span> <span class="s">&quot;d878de4r-99a7-11e3-b31d-5373d7165c2d&quot;</span><span class="p">,</span>
+  <span class="s">&quot;params&quot;</span> <span class="p">:</span> <span class="p">{</span>
+    <span class="s">&quot;access_token&quot;</span> <span class="p">:</span> <span class="p">[</span> <span class="s">&quot;DFR4d5M1mJmoEeOGVPncm-g9qgAAAURv_lfQ7uu6aYHjJJn7QCrGoVnvU-ob5Ko&quot;</span> <span class="p">]</span>
+  <span class="p">},</span>
+  <span class="s">&quot;uri&quot;</span> <span class="p">:</span> <span class="s">&quot;https://api.usergrid.com/amuramoto/secured&quot;</span><span class="p">,</span>
+  <span class="s">&quot;entities&quot;</span> <span class="p">:</span> <span class="p">[</span> <span class="p">{</span>
+    <span class="s">&quot;uuid&quot;</span> <span class="p">:</span> <span class="s">&quot;d878de4r-99a7-11e3-b31d-5373d7165c2d&quot;</span><span class="p">,</span>
+    <span class="s">&quot;type&quot;</span> <span class="p">:</span> <span class="s">&quot;application&quot;</span><span class="p">,</span>
+    <span class="s">&quot;name&quot;</span> <span class="p">:</span> <span class="s">&quot;your-org/your-app&quot;</span><span class="p">,</span>
+    <span class="s">&quot;created&quot;</span> <span class="p">:</span> <span class="mi">1392843003032</span><span class="p">,</span>
+    <span class="s">&quot;modified&quot;</span> <span class="p">:</span> <span class="mi">1392843615777</span><span class="p">,</span>
+    <span class="s">&quot;accesstokenttl&quot;</span> <span class="p">:</span> <span class="mi">1800000</span><span class="p">,</span>
+    <span class="s">&quot;organizationName&quot;</span> <span class="p">:</span> <span class="s">&quot;your-org&quot;</span><span class="p">,</span>
+    <span class="s">&quot;applicationName&quot;</span> <span class="p">:</span> <span class="s">&quot;your-app&quot;</span><span class="p">,</span>
+    <span class="s">&quot;apigeeMobileConfig&quot;</span> <span class="p">:</span> <span class="s">&quot;{...}&quot;</span><span class="p">,</span>
+    <span class="s">&quot;metadata&quot;</span> <span class="p">:</span> <span class="p">{</span>
+      <span class="s">&quot;collections&quot;</span> <span class="p">:</span> <span class="p">[</span> <span class="s">&quot;activities&quot;</span><span class="p">,</span> <span class="s">&quot;assets&quot;</span><span class="p">,</span> <span class="s">&quot;devices&quot;</span><span class="p">,</span> <span class="s">&quot;events&quot;</span><span class="p">,</span> <span class="s">&quot;folders&quot;</span><span class="p">,</span> <span class="s">&quot;groups&quot;</span><span class="p">,</span> <span class="s">&quot;roles&quot;</span><span class="p">,</span> <span class="s">&quot;users&quot;</span> <span class="p">]</span>
+    <span class="p">}</span>
+  <span class="p">}</span> <span class="p">],</span>
+  <span class="s">&quot;timestamp&quot;</span> <span class="p">:</span> <span class="mi">1392843615767</span><span class="p">,</span>
+  <span class="s">&quot;duration&quot;</span> <span class="p">:</span> <span class="mi">28</span><span class="p">,</span>
+  <span class="s">&quot;organization&quot;</span> <span class="p">:</span> <span class="s">&quot;your-org&quot;</span><span class="p">,</span>
+  <span class="s">&quot;applicationName&quot;</span> <span class="p">:</span> <span class="s">&quot;your-app&quot;</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+</div>
+<div class="section" id="changing-ttl-when-a-token-is-created">
+<h2>Changing ttl when a token is created<a class="headerlink" href="#changing-ttl-when-a-token-is-created" title="Permalink to this headline">¶</a></h2>
+<p>When you request an access token, you can override its ttl by including
+a ttl property in the body of the request when the token is created.
+This applies to tokens for all authentication levels, including
+application user, admin user, organization client, and application
+client authentication levels.</p>
+<p>The ttl must be equal to or less than the value of the application
+entity&#8217;s accesstokenttl property. If you specify a ttl value greater
+than the value of accesstokenttl, an error message is returned that
+indicates the maximum time to live value that can be specified.</p>
+<p>For example, the following would create an application user token with a
+ttl of 180000000 milliseconds:</p>
+<div class="highlight-python"><div class="highlight"><pre>curl -X POST https://api.usergrid.com/your-org/your-app/token -d &#39;{&quot;username&quot;:&quot;someUser&quot;, &quot;password&quot;:&quot;somePassword&quot;, &quot;grant_type&quot;:&quot;password&quot;, &quot;ttl&quot;:&quot;180000000&quot;}&#39;
+</pre></div>
+</div>
+<p><strong>Note</strong>: If you set ttl=0, the token will never expire. This can pose a
+security risk and should be used with caution.</p>
+</div>
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+      
+        <a href="authenticating-api-requests.html" class="btn btn-neutral float-right" title="Authenticating API requests" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+      
+      
+        <a href="user-authentication-types.html" class="btn btn-neutral" title="Authentication levels" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+      
+    </div>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/security-and-auth/facebook-sign.html
----------------------------------------------------------------------
diff --git a/content/docs/security-and-auth/facebook-sign.html b/content/docs/security-and-auth/facebook-sign.html
new file mode 100644
index 0000000..69ca5a2
--- /dev/null
+++ b/content/docs/security-and-auth/facebook-sign.html
@@ -0,0 +1,506 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>Facebook sign in &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+        <link rel="next" title="Security best practices" href="securing-your-app.html"/>
+        <link rel="prev" title="Revoking tokens (logout)" href="revoking-tokens-logout.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">Facebook sign in</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#facebook-login-example">Facebook login example</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#step-1-create-a-facebook-app">Step 1: Create a Facebook app</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#step-2-invoke-the-facebook-oauth-dialog">Step 2: Invoke the Facebook OAuth dialog</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#step-3-add-the-javascript-sdk-for-facebook">Step 3: Add the JavaScript SDK for Facebook</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#step-4-setup-fb-login">Step 4. Setup FB.login</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>Facebook sign in</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/security-and-auth/facebook-sign.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="facebook-sign-in">
+<h1>Facebook sign in<a class="headerlink" href="#facebook-sign-in" title="Permalink to this headline">¶</a></h1>
+<p>You can authenticate your Usergrid requests by logging into Facebook. To
+access Usergrid resources, you need to provide an access token with each
+request (unless you use the sandbox app). You can get an access token by
+connecting to an appropriate web service endpoint and providing the
+correct client credentials — this is further described in Authenticating
+users and application clients. However, you can also obtain an access
+token by logging into Facebook.</p>
+<p>To enable authentication to Usergrid through Facebook, do the following
+in your app:</p>
+<ol class="arabic simple">
+<li>Make a login call to the Facebook API (do this using the Facebook SDK
+or API). If the login succeeds, a Facebook access token is returned.</li>
+<li>Send the Facebook access token to Usergrid. If the Facebook access
+token is valid and the user does not already exist in Usergrid,
+Usergrid provisions a new Usergrid user. It also returns an Usergrid
+access token, which you can use for subsequent Usergrid API calls.
+Behind the scenes, Usergrid uses the Facebook access token to
+retrieve the user&#8217;s profile information from Facebook.</li>
+<li>If the Facebook access token is invalid, Facebook returns an OAuth
+authentication error, and the login does not succeed.</li>
+</ol>
+<p>The request to authenticate to Usergrid using a Facebook access token
+is:</p>
+<div class="highlight-python"><div class="highlight"><pre>GET https://api.usergrid.com/{my_org}/{my_app}/auth/facebook?fb_access_token={fb_access_token}
+</pre></div>
+</div>
+<p>where:</p>
+<ul class="simple">
+<li><code class="docutils literal"><span class="pre">{my_org}</span></code> is the organization UUID or organization name.</li>
+<li><code class="docutils literal"><span class="pre">{my_app}</span></code> is the application UUID or application name.</li>
+<li><code class="docutils literal"><span class="pre">{fb_access_token}</span></code> is the Facebook access token.</li>
+</ul>
+<div class="section" id="facebook-login-example">
+<h2>Facebook login example<a class="headerlink" href="#facebook-login-example" title="Permalink to this headline">¶</a></h2>
+<p>The Facebook technical guides for login present detailed information on
+how to add Facebook login to your app. Instructions are provided for
+JavaScript, iOS, and Android.</p>
+<p>In brief, here are the steps for JavaScript. You can see these steps
+implemented in the Facebook login example packaged with the JavaScript
+SDK for Usergrid (which you can download in ZIP format or tar.gz
+format). The Facebook login example is in the /examples/facebook
+directory of the extracted download. The code example snippets shown
+below are taken from the Facebook login example.</p>
+<div class="section" id="step-1-create-a-facebook-app">
+<h3>Step 1: Create a Facebook app<a class="headerlink" href="#step-1-create-a-facebook-app" title="Permalink to this headline">¶</a></h3>
+<p>Create a new app on the Facebook App Dashboard. Enter your app&#8217;s basic
+information. Once created, note the app ID shown at the top of the
+dashboard page.</p>
+</div>
+<div class="section" id="step-2-invoke-the-facebook-oauth-dialog">
+<h3>Step 2: Invoke the Facebook OAuth dialog<a class="headerlink" href="#step-2-invoke-the-facebook-oauth-dialog" title="Permalink to this headline">¶</a></h3>
+<p>Invoke the Facebook OAuth Dialog. To do that, redirect the user&#8217;s
+browser to a URL by inserting the following Javascript code after the
+opening</p>
+<body><p>tag in your app’s HTML file:</p>
+<div class="highlight-python"><div class="highlight"><pre>https://www.facebook.com/dialog/oauth/?
+    client_id={YOUR_APP_ID}
+    &amp;redirect_uri={YOUR_REDIRECT_URL}
+    &amp;state={YOUR_STATE_VALUE}
+    &amp;scope={COMMA_SEPARATED_LIST_OF_PERMISSION_NAMES}
+    &amp;response_type={YOUR_RESPONSE_TYPE}
+</pre></div>
+</div>
+<p>where:</p>
+<p><code class="docutils literal"><span class="pre">{YOUR_APP_ID}</span></code> is the app ID. <code class="docutils literal"><span class="pre">{YOUR_REDIRECT_URL}</span></code> is the
+application UUID or application name. <code class="docutils literal"><span class="pre">{YOUR_STATE_VALUE}</span></code> is a unique
+string used to maintain application state between the request and
+callback. <code class="docutils literal"><span class="pre">{COMMA_SEPARATED_LIST_OF_PERMISSION_NAMES}</span></code> is a comma
+separated list of permission names which you would like the user to
+grant your application. <code class="docutils literal"><span class="pre">{YOUR_RESPONSE_TYPE}</span></code>is the requested
+response type, either code or token. Defaults to code. Set the response
+type to token. With the response type set to token, the Dialog&#8217;s
+response will include an OAuth user access token in the fragment of the
+URL the user is redirected to, as per the client-side authentication
+flow.</p>
+<p>Here is how it’s done in the Facebook login example:</p>
+<div class="highlight-python"><div class="highlight"><pre>var apiKey = $(&quot;#api-key&quot;).val();
+var location = window.location.protocol + &#39;//&#39; + window.location.host;
+var path = window.location.pathname;
+
+var link = &quot;https://www.facebook.com/dialog/oauth?client_id=&quot;;
+link += apiKey;
+link += &quot;&amp;redirect_uri=&quot;;
+link += location+path
+link += &quot;&amp;scope&amp;COMMA_SEPARATED_LIST_OF_PERMISSION_NAMES&amp;response_type=token&quot;;
+
+//now forward the user to facebook
+window.location = link;
+</pre></div>
+</div>
+<p>Notice that the response type is set to token. As a result, a Facebook
+access token will be appended to the URL to which the user is
+redirected.</p>
+</div>
+<div class="section" id="step-3-add-the-javascript-sdk-for-facebook">
+<h3>Step 3: Add the JavaScript SDK for Facebook<a class="headerlink" href="#step-3-add-the-javascript-sdk-for-facebook" title="Permalink to this headline">¶</a></h3>
+<p>Add the following Javascript SDK initialization code after the code that
+invokes the Facebook OAuth Dialog. The code will load and initialize the
+JavaScript SDK in your HTML page. Replace <code class="docutils literal"><span class="pre">YOUR_APP_ID</span></code> with the App
+ID noted in Step 1, and WWW.YOUR_DOMAIN.COM with your own domain.</p>
+<div class="highlight-python"><div class="highlight"><pre>window.fbAsyncInit = function() {
+    FB.init({
+      appId      : &#39;YOUR_APP_ID&#39;, // App ID
+      channelUrl : &#39;//WWW.YOUR_DOMAIN.COM/channel.html&#39;, // Channel File
+      status     : true, // check login status
+      cookie     : true, // enable cookies to allow the server to access the session
+      xfbml      : true  // parse XFBML
+    });
+</pre></div>
+</div>
+<p>Here is how the window.fbAsynchInit() function is implemented in the
+Facebook login example:</p>
+<div class="highlight-python"><div class="highlight"><pre>//load up the facebook api sdk
+  window.fbAsyncInit = function() {
+    FB.init({
+      appId      : &#39;308790195893570&#39;, // App ID
+      channelUrl : &#39;//usergridsdk.dev//examples/channel.html&#39;, // Channel File
+      status     : true, // check login status
+      cookie     : true, // enable cookies to allow the server to access the session
+      xfbml      : true  // parse XFBML
+    });
+  };
+</pre></div>
+</div>
+</div>
+<div class="section" id="step-4-setup-fb-login">
+<h3>Step 4. Setup FB.login<a class="headerlink" href="#step-4-setup-fb-login" title="Permalink to this headline">¶</a></h3>
+<p>Whenever a user is either not logged into Facebook or not authorized for
+an app, it is useful to prompt them with the relevant dialog. The
+<code class="docutils literal"><span class="pre">FB.login()</span></code> Javascript SDK function automatically displays the
+correct one to the user.</p>
+<p>To integrate <code class="docutils literal"><span class="pre">FB.login()</span></code> function in your existing code:</p>
+<div class="highlight-python"><div class="highlight"><pre>function login() {
+    FB.login(function(response) {
+        if (response.authResponse) {
+            // connected
+        } else {
+            // cancelled
+        }
+    });
+}
+</pre></div>
+</div>
+<p>Here is how <code class="docutils literal"><span class="pre">FB.login()</span></code> is implemented in the Facebook login example:</p>
+<div class="highlight-python"><div class="highlight"><pre>function login(facebookAccessToken) {
+    client.loginFacebook(facebookAccessToken, function(err, response){
+      var output = JSON.stringify(response, null, 2);
+      if (err) {
+        var html = &#39;&lt;pre&gt;Oops!  There was an error logging you in. \r\n\r\n&#39;;
+        html += &#39;Error: \r\n&#39; + output+&#39;&lt;/pre&gt;&#39;;
+      } else {
+        var html = &#39;&lt;pre&gt;Hurray!  You have been logged in. \r\n\r\n&#39;;
+        html += &#39;Facebook Token: &#39; + &#39;\r\n&#39; + facebookAccessToken + &#39;\r\n\r\n&#39;;
+        html += &#39;Facebook Profile data stored in Usergrid: \r\n&#39; + output+&#39;&lt;/pre&gt;&#39;;
+      }
+      $(&#39;#facebook-status&#39;).html(html);
+    })
+  }
+</pre></div>
+</div>
+<p>The <code class="docutils literal"><span class="pre">client.loginFacebook()</span></code> function is provided by the Usergrid
+JavaScript SDK. It uses the Facebook auth token to obtain an Usergrid
+auth token. If the Facebook access token is valid and the user does not
+already exist in Usergrid, the function creates a user entity for the
+user. It also uses the Facebook access token to retrieve the user&#8217;s
+profile information from Facebook.</p>
+<p>Here is what the <code class="docutils literal"><span class="pre">client.loginFacebook()</span></code> function looks like:</p>
+<div class="highlight-python"><div class="highlight"><pre>Usergrid.Client.prototype.loginFacebook = function (facebookToken, callback) {
+  var self = this;
+  var options = {
+    method:&#39;GET&#39;,
+    endpoint:&#39;auth/facebook&#39;,
+    qs:{
+      fb_access_token: facebookToken
+    }
+  };
+  this.request(options, function(err, data) {
+    var user = {};
+    if (err &amp;&amp; self.logging) {
+      console.log(&#39;error trying to log user in&#39;);
+    } else {
+      user = new Usergrid.Entity(&#39;users&#39;, data.user);
+      self.setToken(data.access_token);
+    }
+    if (typeof(callback) === &#39;function&#39;) {
+      callback(err, data, user);
+    }
+  });
+}
+</pre></div>
+</div>
+<p>Notice that the function also returns an Usergrid access token, which
+you can use for subsequent Usergrid API calls.</p>
+<p>Remember to create a client for your app, which is the main entry point
+to the JavaScript SDK for Usergrid. You need to do this before you can
+use the SDK. Here’s the code to create a client:</p>
+<div class="highlight-python"><div class="highlight"><pre>var client = new Usergrid.Client({
+    orgName:&#39;yourorgname&#39;,
+    appName:&#39;yourappname&#39;,
+    logging: true, //optional - turn on logging, off by default
+    buildCurl: true //optional - turn on curl commands, off by default
+});
+</pre></div>
+</div>
+</div>
+</div>
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+      
+        <a href="securing-your-app.html" class="btn btn-neutral float-right" title="Security best practices" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+      
+      
+        <a href="revoking-tokens-logout.html" class="btn btn-neutral" title="Revoking tokens (logout)" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+      
+    </div>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

[26/60] [abbrv] incubator-usergrid git commit: cherry picking docs from master

[sn...@apache.org]

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_static/underscore.js
----------------------------------------------------------------------
diff --git a/content/docs/_static/underscore.js b/content/docs/_static/underscore.js
new file mode 100644
index 0000000..5b55f32
--- /dev/null
+++ b/content/docs/_static/underscore.js
@@ -0,0 +1,31 @@
+// Underscore.js 1.3.1
+// (c) 2009-2012 Jeremy Ashkenas, DocumentCloud Inc.
+// Underscore is freely distributable under the MIT license.
+// Portions of Underscore are inspired or borrowed from Prototype,
+// Oliver Steele's Functional, and John Resig's Micro-Templating.
+// For all details and documentation:
+// http://documentcloud.github.com/underscore
+(function(){function q(a,c,d){if(a===c)return a!==0||1/a==1/c;if(a==null||c==null)return a===c;if(a._chain)a=a._wrapped;if(c._chain)c=c._wrapped;if(a.isEqual&&b.isFunction(a.isEqual))return a.isEqual(c);if(c.isEqual&&b.isFunction(c.isEqual))return c.isEqual(a);var e=l.call(a);if(e!=l.call(c))return false;switch(e){case "[object String]":return a==String(c);case "[object Number]":return a!=+a?c!=+c:a==0?1/a==1/c:a==+c;case "[object Date]":case "[object Boolean]":return+a==+c;case "[object RegExp]":return a.source==
+c.source&&a.global==c.global&&a.multiline==c.multiline&&a.ignoreCase==c.ignoreCase}if(typeof a!="object"||typeof c!="object")return false;for(var f=d.length;f--;)if(d[f]==a)return true;d.push(a);var f=0,g=true;if(e=="[object Array]"){if(f=a.length,g=f==c.length)for(;f--;)if(!(g=f in a==f in c&&q(a[f],c[f],d)))break}else{if("constructor"in a!="constructor"in c||a.constructor!=c.constructor)return false;for(var h in a)if(b.has(a,h)&&(f++,!(g=b.has(c,h)&&q(a[h],c[h],d))))break;if(g){for(h in c)if(b.has(c,
+h)&&!f--)break;g=!f}}d.pop();return g}var r=this,G=r._,n={},k=Array.prototype,o=Object.prototype,i=k.slice,H=k.unshift,l=o.toString,I=o.hasOwnProperty,w=k.forEach,x=k.map,y=k.reduce,z=k.reduceRight,A=k.filter,B=k.every,C=k.some,p=k.indexOf,D=k.lastIndexOf,o=Array.isArray,J=Object.keys,s=Function.prototype.bind,b=function(a){return new m(a)};if(typeof exports!=="undefined"){if(typeof module!=="undefined"&&module.exports)exports=module.exports=b;exports._=b}else r._=b;b.VERSION="1.3.1";var j=b.each=
+b.forEach=function(a,c,d){if(a!=null)if(w&&a.forEach===w)a.forEach(c,d);else if(a.length===+a.length)for(var e=0,f=a.length;e<f;e++){if(e in a&&c.call(d,a[e],e,a)===n)break}else for(e in a)if(b.has(a,e)&&c.call(d,a[e],e,a)===n)break};b.map=b.collect=function(a,c,b){var e=[];if(a==null)return e;if(x&&a.map===x)return a.map(c,b);j(a,function(a,g,h){e[e.length]=c.call(b,a,g,h)});if(a.length===+a.length)e.length=a.length;return e};b.reduce=b.foldl=b.inject=function(a,c,d,e){var f=arguments.length>2;a==
+null&&(a=[]);if(y&&a.reduce===y)return e&&(c=b.bind(c,e)),f?a.reduce(c,d):a.reduce(c);j(a,function(a,b,i){f?d=c.call(e,d,a,b,i):(d=a,f=true)});if(!f)throw new TypeError("Reduce of empty array with no initial value");return d};b.reduceRight=b.foldr=function(a,c,d,e){var f=arguments.length>2;a==null&&(a=[]);if(z&&a.reduceRight===z)return e&&(c=b.bind(c,e)),f?a.reduceRight(c,d):a.reduceRight(c);var g=b.toArray(a).reverse();e&&!f&&(c=b.bind(c,e));return f?b.reduce(g,c,d,e):b.reduce(g,c)};b.find=b.detect=
+function(a,c,b){var e;E(a,function(a,g,h){if(c.call(b,a,g,h))return e=a,true});return e};b.filter=b.select=function(a,c,b){var e=[];if(a==null)return e;if(A&&a.filter===A)return a.filter(c,b);j(a,function(a,g,h){c.call(b,a,g,h)&&(e[e.length]=a)});return e};b.reject=function(a,c,b){var e=[];if(a==null)return e;j(a,function(a,g,h){c.call(b,a,g,h)||(e[e.length]=a)});return e};b.every=b.all=function(a,c,b){var e=true;if(a==null)return e;if(B&&a.every===B)return a.every(c,b);j(a,function(a,g,h){if(!(e=
+e&&c.call(b,a,g,h)))return n});return e};var E=b.some=b.any=function(a,c,d){c||(c=b.identity);var e=false;if(a==null)return e;if(C&&a.some===C)return a.some(c,d);j(a,function(a,b,h){if(e||(e=c.call(d,a,b,h)))return n});return!!e};b.include=b.contains=function(a,c){var b=false;if(a==null)return b;return p&&a.indexOf===p?a.indexOf(c)!=-1:b=E(a,function(a){return a===c})};b.invoke=function(a,c){var d=i.call(arguments,2);return b.map(a,function(a){return(b.isFunction(c)?c||a:a[c]).apply(a,d)})};b.pluck=
+function(a,c){return b.map(a,function(a){return a[c]})};b.max=function(a,c,d){if(!c&&b.isArray(a))return Math.max.apply(Math,a);if(!c&&b.isEmpty(a))return-Infinity;var e={computed:-Infinity};j(a,function(a,b,h){b=c?c.call(d,a,b,h):a;b>=e.computed&&(e={value:a,computed:b})});return e.value};b.min=function(a,c,d){if(!c&&b.isArray(a))return Math.min.apply(Math,a);if(!c&&b.isEmpty(a))return Infinity;var e={computed:Infinity};j(a,function(a,b,h){b=c?c.call(d,a,b,h):a;b<e.computed&&(e={value:a,computed:b})});
+return e.value};b.shuffle=function(a){var b=[],d;j(a,function(a,f){f==0?b[0]=a:(d=Math.floor(Math.random()*(f+1)),b[f]=b[d],b[d]=a)});return b};b.sortBy=function(a,c,d){return b.pluck(b.map(a,function(a,b,g){return{value:a,criteria:c.call(d,a,b,g)}}).sort(function(a,b){var c=a.criteria,d=b.criteria;return c<d?-1:c>d?1:0}),"value")};b.groupBy=function(a,c){var d={},e=b.isFunction(c)?c:function(a){return a[c]};j(a,function(a,b){var c=e(a,b);(d[c]||(d[c]=[])).push(a)});return d};b.sortedIndex=function(a,
+c,d){d||(d=b.identity);for(var e=0,f=a.length;e<f;){var g=e+f>>1;d(a[g])<d(c)?e=g+1:f=g}return e};b.toArray=function(a){return!a?[]:a.toArray?a.toArray():b.isArray(a)?i.call(a):b.isArguments(a)?i.call(a):b.values(a)};b.size=function(a){return b.toArray(a).length};b.first=b.head=function(a,b,d){return b!=null&&!d?i.call(a,0,b):a[0]};b.initial=function(a,b,d){return i.call(a,0,a.length-(b==null||d?1:b))};b.last=function(a,b,d){return b!=null&&!d?i.call(a,Math.max(a.length-b,0)):a[a.length-1]};b.rest=
+b.tail=function(a,b,d){return i.call(a,b==null||d?1:b)};b.compact=function(a){return b.filter(a,function(a){return!!a})};b.flatten=function(a,c){return b.reduce(a,function(a,e){if(b.isArray(e))return a.concat(c?e:b.flatten(e));a[a.length]=e;return a},[])};b.without=function(a){return b.difference(a,i.call(arguments,1))};b.uniq=b.unique=function(a,c,d){var d=d?b.map(a,d):a,e=[];b.reduce(d,function(d,g,h){if(0==h||(c===true?b.last(d)!=g:!b.include(d,g)))d[d.length]=g,e[e.length]=a[h];return d},[]);
+return e};b.union=function(){return b.uniq(b.flatten(arguments,true))};b.intersection=b.intersect=function(a){var c=i.call(arguments,1);return b.filter(b.uniq(a),function(a){return b.every(c,function(c){return b.indexOf(c,a)>=0})})};b.difference=function(a){var c=b.flatten(i.call(arguments,1));return b.filter(a,function(a){return!b.include(c,a)})};b.zip=function(){for(var a=i.call(arguments),c=b.max(b.pluck(a,"length")),d=Array(c),e=0;e<c;e++)d[e]=b.pluck(a,""+e);return d};b.indexOf=function(a,c,
+d){if(a==null)return-1;var e;if(d)return d=b.sortedIndex(a,c),a[d]===c?d:-1;if(p&&a.indexOf===p)return a.indexOf(c);for(d=0,e=a.length;d<e;d++)if(d in a&&a[d]===c)return d;return-1};b.lastIndexOf=function(a,b){if(a==null)return-1;if(D&&a.lastIndexOf===D)return a.lastIndexOf(b);for(var d=a.length;d--;)if(d in a&&a[d]===b)return d;return-1};b.range=function(a,b,d){arguments.length<=1&&(b=a||0,a=0);for(var d=arguments[2]||1,e=Math.max(Math.ceil((b-a)/d),0),f=0,g=Array(e);f<e;)g[f++]=a,a+=d;return g};
+var F=function(){};b.bind=function(a,c){var d,e;if(a.bind===s&&s)return s.apply(a,i.call(arguments,1));if(!b.isFunction(a))throw new TypeError;e=i.call(arguments,2);return d=function(){if(!(this instanceof d))return a.apply(c,e.concat(i.call(arguments)));F.prototype=a.prototype;var b=new F,g=a.apply(b,e.concat(i.call(arguments)));return Object(g)===g?g:b}};b.bindAll=function(a){var c=i.call(arguments,1);c.length==0&&(c=b.functions(a));j(c,function(c){a[c]=b.bind(a[c],a)});return a};b.memoize=function(a,
+c){var d={};c||(c=b.identity);return function(){var e=c.apply(this,arguments);return b.has(d,e)?d[e]:d[e]=a.apply(this,arguments)}};b.delay=function(a,b){var d=i.call(arguments,2);return setTimeout(function(){return a.apply(a,d)},b)};b.defer=function(a){return b.delay.apply(b,[a,1].concat(i.call(arguments,1)))};b.throttle=function(a,c){var d,e,f,g,h,i=b.debounce(function(){h=g=false},c);return function(){d=this;e=arguments;var b;f||(f=setTimeout(function(){f=null;h&&a.apply(d,e);i()},c));g?h=true:
+a.apply(d,e);i();g=true}};b.debounce=function(a,b){var d;return function(){var e=this,f=arguments;clearTimeout(d);d=setTimeout(function(){d=null;a.apply(e,f)},b)}};b.once=function(a){var b=false,d;return function(){if(b)return d;b=true;return d=a.apply(this,arguments)}};b.wrap=function(a,b){return function(){var d=[a].concat(i.call(arguments,0));return b.apply(this,d)}};b.compose=function(){var a=arguments;return function(){for(var b=arguments,d=a.length-1;d>=0;d--)b=[a[d].apply(this,b)];return b[0]}};
+b.after=function(a,b){return a<=0?b():function(){if(--a<1)return b.apply(this,arguments)}};b.keys=J||function(a){if(a!==Object(a))throw new TypeError("Invalid object");var c=[],d;for(d in a)b.has(a,d)&&(c[c.length]=d);return c};b.values=function(a){return b.map(a,b.identity)};b.functions=b.methods=function(a){var c=[],d;for(d in a)b.isFunction(a[d])&&c.push(d);return c.sort()};b.extend=function(a){j(i.call(arguments,1),function(b){for(var d in b)a[d]=b[d]});return a};b.defaults=function(a){j(i.call(arguments,
+1),function(b){for(var d in b)a[d]==null&&(a[d]=b[d])});return a};b.clone=function(a){return!b.isObject(a)?a:b.isArray(a)?a.slice():b.extend({},a)};b.tap=function(a,b){b(a);return a};b.isEqual=function(a,b){return q(a,b,[])};b.isEmpty=function(a){if(b.isArray(a)||b.isString(a))return a.length===0;for(var c in a)if(b.has(a,c))return false;return true};b.isElement=function(a){return!!(a&&a.nodeType==1)};b.isArray=o||function(a){return l.call(a)=="[object Array]"};b.isObject=function(a){return a===Object(a)};
+b.isArguments=function(a){return l.call(a)=="[object Arguments]"};if(!b.isArguments(arguments))b.isArguments=function(a){return!(!a||!b.has(a,"callee"))};b.isFunction=function(a){return l.call(a)=="[object Function]"};b.isString=function(a){return l.call(a)=="[object String]"};b.isNumber=function(a){return l.call(a)=="[object Number]"};b.isNaN=function(a){return a!==a};b.isBoolean=function(a){return a===true||a===false||l.call(a)=="[object Boolean]"};b.isDate=function(a){return l.call(a)=="[object Date]"};
+b.isRegExp=function(a){return l.call(a)=="[object RegExp]"};b.isNull=function(a){return a===null};b.isUndefined=function(a){return a===void 0};b.has=function(a,b){return I.call(a,b)};b.noConflict=function(){r._=G;return this};b.identity=function(a){return a};b.times=function(a,b,d){for(var e=0;e<a;e++)b.call(d,e)};b.escape=function(a){return(""+a).replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;").replace(/'/g,"&#x27;").replace(/\//g,"&#x2F;")};b.mixin=function(a){j(b.functions(a),
+function(c){K(c,b[c]=a[c])})};var L=0;b.uniqueId=function(a){var b=L++;return a?a+b:b};b.templateSettings={evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,escape:/<%-([\s\S]+?)%>/g};var t=/.^/,u=function(a){return a.replace(/\\\\/g,"\\").replace(/\\'/g,"'")};b.template=function(a,c){var d=b.templateSettings,d="var __p=[],print=function(){__p.push.apply(__p,arguments);};with(obj||{}){__p.push('"+a.replace(/\\/g,"\\\\").replace(/'/g,"\\'").replace(d.escape||t,function(a,b){return"',_.escape("+
+u(b)+"),'"}).replace(d.interpolate||t,function(a,b){return"',"+u(b)+",'"}).replace(d.evaluate||t,function(a,b){return"');"+u(b).replace(/[\r\n\t]/g," ")+";__p.push('"}).replace(/\r/g,"\\r").replace(/\n/g,"\\n").replace(/\t/g,"\\t")+"');}return __p.join('');",e=new Function("obj","_",d);return c?e(c,b):function(a){return e.call(this,a,b)}};b.chain=function(a){return b(a).chain()};var m=function(a){this._wrapped=a};b.prototype=m.prototype;var v=function(a,c){return c?b(a).chain():a},K=function(a,c){m.prototype[a]=
+function(){var a=i.call(arguments);H.call(a,this._wrapped);return v(c.apply(b,a),this._chain)}};b.mixin(b);j("pop,push,reverse,shift,sort,splice,unshift".split(","),function(a){var b=k[a];m.prototype[a]=function(){var d=this._wrapped;b.apply(d,arguments);var e=d.length;(a=="shift"||a=="splice")&&e===0&&delete d[0];return v(d,this._chain)}});j(["concat","join","slice"],function(a){var b=k[a];m.prototype[a]=function(){return v(b.apply(this._wrapped,arguments),this._chain)}});m.prototype.chain=function(){this._chain=
+true;return this};m.prototype.value=function(){return this._wrapped}}).call(this);

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_static/up-pressed.png
----------------------------------------------------------------------
diff --git a/content/docs/_static/up-pressed.png b/content/docs/_static/up-pressed.png
new file mode 100644
index 0000000..99e7210
Binary files /dev/null and b/content/docs/_static/up-pressed.png differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_static/up.png
----------------------------------------------------------------------
diff --git a/content/docs/_static/up.png b/content/docs/_static/up.png
new file mode 100644
index 0000000..26de002
Binary files /dev/null and b/content/docs/_static/up.png differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_static/websupport.js
----------------------------------------------------------------------
diff --git a/content/docs/_static/websupport.js b/content/docs/_static/websupport.js
new file mode 100644
index 0000000..28d65db
--- /dev/null
+++ b/content/docs/_static/websupport.js
@@ -0,0 +1,808 @@
+/*
+ * websupport.js
+ * ~~~~~~~~~~~~~
+ *
+ * sphinx.websupport utilties for all documentation.
+ *
+ * :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+ * :license: BSD, see LICENSE for details.
+ *
+ */
+
+(function($) {
+  $.fn.autogrow = function() {
+    return this.each(function() {
+    var textarea = this;
+
+    $.fn.autogrow.resize(textarea);
+
+    $(textarea)
+      .focus(function() {
+        textarea.interval = setInterval(function() {
+          $.fn.autogrow.resize(textarea);
+        }, 500);
+      })
+      .blur(function() {
+        clearInterval(textarea.interval);
+      });
+    });
+  };
+
+  $.fn.autogrow.resize = function(textarea) {
+    var lineHeight = parseInt($(textarea).css('line-height'), 10);
+    var lines = textarea.value.split('\n');
+    var columns = textarea.cols;
+    var lineCount = 0;
+    $.each(lines, function() {
+      lineCount += Math.ceil(this.length / columns) || 1;
+    });
+    var height = lineHeight * (lineCount + 1);
+    $(textarea).css('height', height);
+  };
+})(jQuery);
+
+(function($) {
+  var comp, by;
+
+  function init() {
+    initEvents();
+    initComparator();
+  }
+
+  function initEvents() {
+    $(document).on("click", 'a.comment-close', function(event) {
+      event.preventDefault();
+      hide($(this).attr('id').substring(2));
+    });
+    $(document).on("click", 'a.vote', function(event) {
+      event.preventDefault();
+      handleVote($(this));
+    });
+    $(document).on("click", 'a.reply', function(event) {
+      event.preventDefault();
+      openReply($(this).attr('id').substring(2));
+    });
+    $(document).on("click", 'a.close-reply', function(event) {
+      event.preventDefault();
+      closeReply($(this).attr('id').substring(2));
+    });
+    $(document).on("click", 'a.sort-option', function(event) {
+      event.preventDefault();
+      handleReSort($(this));
+    });
+    $(document).on("click", 'a.show-proposal', function(event) {
+      event.preventDefault();
+      showProposal($(this).attr('id').substring(2));
+    });
+    $(document).on("click", 'a.hide-proposal', function(event) {
+      event.preventDefault();
+      hideProposal($(this).attr('id').substring(2));
+    });
+    $(document).on("click", 'a.show-propose-change', function(event) {
+      event.preventDefault();
+      showProposeChange($(this).attr('id').substring(2));
+    });
+    $(document).on("click", 'a.hide-propose-change', function(event) {
+      event.preventDefault();
+      hideProposeChange($(this).attr('id').substring(2));
+    });
+    $(document).on("click", 'a.accept-comment', function(event) {
+      event.preventDefault();
+      acceptComment($(this).attr('id').substring(2));
+    });
+    $(document).on("click", 'a.delete-comment', function(event) {
+      event.preventDefault();
+      deleteComment($(this).attr('id').substring(2));
+    });
+    $(document).on("click", 'a.comment-markup', function(event) {
+      event.preventDefault();
+      toggleCommentMarkupBox($(this).attr('id').substring(2));
+    });
+  }
+
+  /**
+   * Set comp, which is a comparator function used for sorting and
+   * inserting comments into the list.
+   */
+  function setComparator() {
+    // If the first three letters are "asc", sort in ascending order
+    // and remove the prefix.
+    if (by.substring(0,3) == 'asc') {
+      var i = by.substring(3);
+      comp = function(a, b) { return a[i] - b[i]; };
+    } else {
+      // Otherwise sort in descending order.
+      comp = function(a, b) { return b[by] - a[by]; };
+    }
+
+    // Reset link styles and format the selected sort option.
+    $('a.sel').attr('href', '#').removeClass('sel');
+    $('a.by' + by).removeAttr('href').addClass('sel');
+  }
+
+  /**
+   * Create a comp function. If the user has preferences stored in
+   * the sortBy cookie, use those, otherwise use the default.
+   */
+  function initComparator() {
+    by = 'rating'; // Default to sort by rating.
+    // If the sortBy cookie is set, use that instead.
+    if (document.cookie.length > 0) {
+      var start = document.cookie.indexOf('sortBy=');
+      if (start != -1) {
+        start = start + 7;
+        var end = document.cookie.indexOf(";", start);
+        if (end == -1) {
+          end = document.cookie.length;
+          by = unescape(document.cookie.substring(start, end));
+        }
+      }
+    }
+    setComparator();
+  }
+
+  /**
+   * Show a comment div.
+   */
+  function show(id) {
+    $('#ao' + id).hide();
+    $('#ah' + id).show();
+    var context = $.extend({id: id}, opts);
+    var popup = $(renderTemplate(popupTemplate, context)).hide();
+    popup.find('textarea[name="proposal"]').hide();
+    popup.find('a.by' + by).addClass('sel');
+    var form = popup.find('#cf' + id);
+    form.submit(function(event) {
+      event.preventDefault();
+      addComment(form);
+    });
+    $('#s' + id).after(popup);
+    popup.slideDown('fast', function() {
+      getComments(id);
+    });
+  }
+
+  /**
+   * Hide a comment div.
+   */
+  function hide(id) {
+    $('#ah' + id).hide();
+    $('#ao' + id).show();
+    var div = $('#sc' + id);
+    div.slideUp('fast', function() {
+      div.remove();
+    });
+  }
+
+  /**
+   * Perform an ajax request to get comments for a node
+   * and insert the comments into the comments tree.
+   */
+  function getComments(id) {
+    $.ajax({
+     type: 'GET',
+     url: opts.getCommentsURL,
+     data: {node: id},
+     success: function(data, textStatus, request) {
+       var ul = $('#cl' + id);
+       var speed = 100;
+       $('#cf' + id)
+         .find('textarea[name="proposal"]')
+         .data('source', data.source);
+
+       if (data.comments.length === 0) {
+         ul.html('<li>No comments yet.</li>');
+         ul.data('empty', true);
+       } else {
+         // If there are comments, sort them and put them in the list.
+         var comments = sortComments(data.comments);
+         speed = data.comments.length * 100;
+         appendComments(comments, ul);
+         ul.data('empty', false);
+       }
+       $('#cn' + id).slideUp(speed + 200);
+       ul.slideDown(speed);
+     },
+     error: function(request, textStatus, error) {
+       showError('Oops, there was a problem retrieving the comments.');
+     },
+     dataType: 'json'
+    });
+  }
+
+  /**
+   * Add a comment via ajax and insert the comment into the comment tree.
+   */
+  function addComment(form) {
+    var node_id = form.find('input[name="node"]').val();
+    var parent_id = form.find('input[name="parent"]').val();
+    var text = form.find('textarea[name="comment"]').val();
+    var proposal = form.find('textarea[name="proposal"]').val();
+
+    if (text == '') {
+      showError('Please enter a comment.');
+      return;
+    }
+
+    // Disable the form that is being submitted.
+    form.find('textarea,input').attr('disabled', 'disabled');
+
+    // Send the comment to the server.
+    $.ajax({
+      type: "POST",
+      url: opts.addCommentURL,
+      dataType: 'json',
+      data: {
+        node: node_id,
+        parent: parent_id,
+        text: text,
+        proposal: proposal
+      },
+      success: function(data, textStatus, error) {
+        // Reset the form.
+        if (node_id) {
+          hideProposeChange(node_id);
+        }
+        form.find('textarea')
+          .val('')
+          .add(form.find('input'))
+          .removeAttr('disabled');
+	var ul = $('#cl' + (node_id || parent_id));
+        if (ul.data('empty')) {
+          $(ul).empty();
+          ul.data('empty', false);
+        }
+        insertComment(data.comment);
+        var ao = $('#ao' + node_id);
+        ao.find('img').attr({'src': opts.commentBrightImage});
+        if (node_id) {
+          // if this was a "root" comment, remove the commenting box
+          // (the user can get it back by reopening the comment popup)
+          $('#ca' + node_id).slideUp();
+        }
+      },
+      error: function(request, textStatus, error) {
+        form.find('textarea,input').removeAttr('disabled');
+        showError('Oops, there was a problem adding the comment.');
+      }
+    });
+  }
+
+  /**
+   * Recursively append comments to the main comment list and children
+   * lists, creating the comment tree.
+   */
+  function appendComments(comments, ul) {
+    $.each(comments, function() {
+      var div = createCommentDiv(this);
+      ul.append($(document.createElement('li')).html(div));
+      appendComments(this.children, div.find('ul.comment-children'));
+      // To avoid stagnating data, don't store the comments children in data.
+      this.children = null;
+      div.data('comment', this);
+    });
+  }
+
+  /**
+   * After adding a new comment, it must be inserted in the correct
+   * location in the comment tree.
+   */
+  function insertComment(comment) {
+    var div = createCommentDiv(comment);
+
+    // To avoid stagnating data, don't store the comments children in data.
+    comment.children = null;
+    div.data('comment', comment);
+
+    var ul = $('#cl' + (comment.node || comment.parent));
+    var siblings = getChildren(ul);
+
+    var li = $(document.createElement('li'));
+    li.hide();
+
+    // Determine where in the parents children list to insert this comment.
+    for(i=0; i < siblings.length; i++) {
+      if (comp(comment, siblings[i]) <= 0) {
+        $('#cd' + siblings[i].id)
+          .parent()
+          .before(li.html(div));
+        li.slideDown('fast');
+        return;
+      }
+    }
+
+    // If we get here, this comment rates lower than all the others,
+    // or it is the only comment in the list.
+    ul.append(li.html(div));
+    li.slideDown('fast');
+  }
+
+  function acceptComment(id) {
+    $.ajax({
+      type: 'POST',
+      url: opts.acceptCommentURL,
+      data: {id: id},
+      success: function(data, textStatus, request) {
+        $('#cm' + id).fadeOut('fast');
+        $('#cd' + id).removeClass('moderate');
+      },
+      error: function(request, textStatus, error) {
+        showError('Oops, there was a problem accepting the comment.');
+      }
+    });
+  }
+
+  function deleteComment(id) {
+    $.ajax({
+      type: 'POST',
+      url: opts.deleteCommentURL,
+      data: {id: id},
+      success: function(data, textStatus, request) {
+        var div = $('#cd' + id);
+        if (data == 'delete') {
+          // Moderator mode: remove the comment and all children immediately
+          div.slideUp('fast', function() {
+            div.remove();
+          });
+          return;
+        }
+        // User mode: only mark the comment as deleted
+        div
+          .find('span.user-id:first')
+          .text('[deleted]').end()
+          .find('div.comment-text:first')
+          .text('[deleted]').end()
+          .find('#cm' + id + ', #dc' + id + ', #ac' + id + ', #rc' + id +
+                ', #sp' + id + ', #hp' + id + ', #cr' + id + ', #rl' + id)
+          .remove();
+        var comment = div.data('comment');
+        comment.username = '[deleted]';
+        comment.text = '[deleted]';
+        div.data('comment', comment);
+      },
+      error: function(request, textStatus, error) {
+        showError('Oops, there was a problem deleting the comment.');
+      }
+    });
+  }
+
+  function showProposal(id) {
+    $('#sp' + id).hide();
+    $('#hp' + id).show();
+    $('#pr' + id).slideDown('fast');
+  }
+
+  function hideProposal(id) {
+    $('#hp' + id).hide();
+    $('#sp' + id).show();
+    $('#pr' + id).slideUp('fast');
+  }
+
+  function showProposeChange(id) {
+    $('#pc' + id).hide();
+    $('#hc' + id).show();
+    var textarea = $('#pt' + id);
+    textarea.val(textarea.data('source'));
+    $.fn.autogrow.resize(textarea[0]);
+    textarea.slideDown('fast');
+  }
+
+  function hideProposeChange(id) {
+    $('#hc' + id).hide();
+    $('#pc' + id).show();
+    var textarea = $('#pt' + id);
+    textarea.val('').removeAttr('disabled');
+    textarea.slideUp('fast');
+  }
+
+  function toggleCommentMarkupBox(id) {
+    $('#mb' + id).toggle();
+  }
+
+  /** Handle when the user clicks on a sort by link. */
+  function handleReSort(link) {
+    var classes = link.attr('class').split(/\s+/);
+    for (var i=0; i<classes.length; i++) {
+      if (classes[i] != 'sort-option') {
+	by = classes[i].substring(2);
+      }
+    }
+    setComparator();
+    // Save/update the sortBy cookie.
+    var expiration = new Date();
+    expiration.setDate(expiration.getDate() + 365);
+    document.cookie= 'sortBy=' + escape(by) +
+                     ';expires=' + expiration.toUTCString();
+    $('ul.comment-ul').each(function(index, ul) {
+      var comments = getChildren($(ul), true);
+      comments = sortComments(comments);
+      appendComments(comments, $(ul).empty());
+    });
+  }
+
+  /**
+   * Function to process a vote when a user clicks an arrow.
+   */
+  function handleVote(link) {
+    if (!opts.voting) {
+      showError("You'll need to login to vote.");
+      return;
+    }
+
+    var id = link.attr('id');
+    if (!id) {
+      // Didn't click on one of the voting arrows.
+      return;
+    }
+    // If it is an unvote, the new vote value is 0,
+    // Otherwise it's 1 for an upvote, or -1 for a downvote.
+    var value = 0;
+    if (id.charAt(1) != 'u') {
+      value = id.charAt(0) == 'u' ? 1 : -1;
+    }
+    // The data to be sent to the server.
+    var d = {
+      comment_id: id.substring(2),
+      value: value
+    };
+
+    // Swap the vote and unvote links.
+    link.hide();
+    $('#' + id.charAt(0) + (id.charAt(1) == 'u' ? 'v' : 'u') + d.comment_id)
+      .show();
+
+    // The div the comment is displayed in.
+    var div = $('div#cd' + d.comment_id);
+    var data = div.data('comment');
+
+    // If this is not an unvote, and the other vote arrow has
+    // already been pressed, unpress it.
+    if ((d.value !== 0) && (data.vote === d.value * -1)) {
+      $('#' + (d.value == 1 ? 'd' : 'u') + 'u' + d.comment_id).hide();
+      $('#' + (d.value == 1 ? 'd' : 'u') + 'v' + d.comment_id).show();
+    }
+
+    // Update the comments rating in the local data.
+    data.rating += (data.vote === 0) ? d.value : (d.value - data.vote);
+    data.vote = d.value;
+    div.data('comment', data);
+
+    // Change the rating text.
+    div.find('.rating:first')
+      .text(data.rating + ' point' + (data.rating == 1 ? '' : 's'));
+
+    // Send the vote information to the server.
+    $.ajax({
+      type: "POST",
+      url: opts.processVoteURL,
+      data: d,
+      error: function(request, textStatus, error) {
+        showError('Oops, there was a problem casting that vote.');
+      }
+    });
+  }
+
+  /**
+   * Open a reply form used to reply to an existing comment.
+   */
+  function openReply(id) {
+    // Swap out the reply link for the hide link
+    $('#rl' + id).hide();
+    $('#cr' + id).show();
+
+    // Add the reply li to the children ul.
+    var div = $(renderTemplate(replyTemplate, {id: id})).hide();
+    $('#cl' + id)
+      .prepend(div)
+      // Setup the submit handler for the reply form.
+      .find('#rf' + id)
+      .submit(function(event) {
+        event.preventDefault();
+        addComment($('#rf' + id));
+        closeReply(id);
+      })
+      .find('input[type=button]')
+      .click(function() {
+        closeReply(id);
+      });
+    div.slideDown('fast', function() {
+      $('#rf' + id).find('textarea').focus();
+    });
+  }
+
+  /**
+   * Close the reply form opened with openReply.
+   */
+  function closeReply(id) {
+    // Remove the reply div from the DOM.
+    $('#rd' + id).slideUp('fast', function() {
+      $(this).remove();
+    });
+
+    // Swap out the hide link for the reply link
+    $('#cr' + id).hide();
+    $('#rl' + id).show();
+  }
+
+  /**
+   * Recursively sort a tree of comments using the comp comparator.
+   */
+  function sortComments(comments) {
+    comments.sort(comp);
+    $.each(comments, function() {
+      this.children = sortComments(this.children);
+    });
+    return comments;
+  }
+
+  /**
+   * Get the children comments from a ul. If recursive is true,
+   * recursively include childrens' children.
+   */
+  function getChildren(ul, recursive) {
+    var children = [];
+    ul.children().children("[id^='cd']")
+      .each(function() {
+        var comment = $(this).data('comment');
+        if (recursive)
+          comment.children = getChildren($(this).find('#cl' + comment.id), true);
+        children.push(comment);
+      });
+    return children;
+  }
+
+  /** Create a div to display a comment in. */
+  function createCommentDiv(comment) {
+    if (!comment.displayed && !opts.moderator) {
+      return $('<div class="moderate">Thank you!  Your comment will show up '
+               + 'once it is has been approved by a moderator.</div>');
+    }
+    // Prettify the comment rating.
+    comment.pretty_rating = comment.rating + ' point' +
+      (comment.rating == 1 ? '' : 's');
+    // Make a class (for displaying not yet moderated comments differently)
+    comment.css_class = comment.displayed ? '' : ' moderate';
+    // Create a div for this comment.
+    var context = $.extend({}, opts, comment);
+    var div = $(renderTemplate(commentTemplate, context));
+
+    // If the user has voted on this comment, highlight the correct arrow.
+    if (comment.vote) {
+      var direction = (comment.vote == 1) ? 'u' : 'd';
+      div.find('#' + direction + 'v' + comment.id).hide();
+      div.find('#' + direction + 'u' + comment.id).show();
+    }
+
+    if (opts.moderator || comment.text != '[deleted]') {
+      div.find('a.reply').show();
+      if (comment.proposal_diff)
+        div.find('#sp' + comment.id).show();
+      if (opts.moderator && !comment.displayed)
+        div.find('#cm' + comment.id).show();
+      if (opts.moderator || (opts.username == comment.username))
+        div.find('#dc' + comment.id).show();
+    }
+    return div;
+  }
+
+  /**
+   * A simple template renderer. Placeholders such as <%id%> are replaced
+   * by context['id'] with items being escaped. Placeholders such as <#id#>
+   * are not escaped.
+   */
+  function renderTemplate(template, context) {
+    var esc = $(document.createElement('div'));
+
+    function handle(ph, escape) {
+      var cur = context;
+      $.each(ph.split('.'), function() {
+        cur = cur[this];
+      });
+      return escape ? esc.text(cur || "").html() : cur;
+    }
+
+    return template.replace(/<([%#])([\w\.]*)\1>/g, function() {
+      return handle(arguments[2], arguments[1] == '%' ? true : false);
+    });
+  }
+
+  /** Flash an error message briefly. */
+  function showError(message) {
+    $(document.createElement('div')).attr({'class': 'popup-error'})
+      .append($(document.createElement('div'))
+               .attr({'class': 'error-message'}).text(message))
+      .appendTo('body')
+      .fadeIn("slow")
+      .delay(2000)
+      .fadeOut("slow");
+  }
+
+  /** Add a link the user uses to open the comments popup. */
+  $.fn.comment = function() {
+    return this.each(function() {
+      var id = $(this).attr('id').substring(1);
+      var count = COMMENT_METADATA[id];
+      var title = count + ' comment' + (count == 1 ? '' : 's');
+      var image = count > 0 ? opts.commentBrightImage : opts.commentImage;
+      var addcls = count == 0 ? ' nocomment' : '';
+      $(this)
+        .append(
+          $(document.createElement('a')).attr({
+            href: '#',
+            'class': 'sphinx-comment-open' + addcls,
+            id: 'ao' + id
+          })
+            .append($(document.createElement('img')).attr({
+              src: image,
+              alt: 'comment',
+              title: title
+            }))
+            .click(function(event) {
+              event.preventDefault();
+              show($(this).attr('id').substring(2));
+            })
+        )
+        .append(
+          $(document.createElement('a')).attr({
+            href: '#',
+            'class': 'sphinx-comment-close hidden',
+            id: 'ah' + id
+          })
+            .append($(document.createElement('img')).attr({
+              src: opts.closeCommentImage,
+              alt: 'close',
+              title: 'close'
+            }))
+            .click(function(event) {
+              event.preventDefault();
+              hide($(this).attr('id').substring(2));
+            })
+        );
+    });
+  };
+
+  var opts = {
+    processVoteURL: '/_process_vote',
+    addCommentURL: '/_add_comment',
+    getCommentsURL: '/_get_comments',
+    acceptCommentURL: '/_accept_comment',
+    deleteCommentURL: '/_delete_comment',
+    commentImage: '/static/_static/comment.png',
+    closeCommentImage: '/static/_static/comment-close.png',
+    loadingImage: '/static/_static/ajax-loader.gif',
+    commentBrightImage: '/static/_static/comment-bright.png',
+    upArrow: '/static/_static/up.png',
+    downArrow: '/static/_static/down.png',
+    upArrowPressed: '/static/_static/up-pressed.png',
+    downArrowPressed: '/static/_static/down-pressed.png',
+    voting: false,
+    moderator: false
+  };
+
+  if (typeof COMMENT_OPTIONS != "undefined") {
+    opts = jQuery.extend(opts, COMMENT_OPTIONS);
+  }
+
+  var popupTemplate = '\
+    <div class="sphinx-comments" id="sc<%id%>">\
+      <p class="sort-options">\
+        Sort by:\
+        <a href="#" class="sort-option byrating">best rated</a>\
+        <a href="#" class="sort-option byascage">newest</a>\
+        <a href="#" class="sort-option byage">oldest</a>\
+      </p>\
+      <div class="comment-header">Comments</div>\
+      <div class="comment-loading" id="cn<%id%>">\
+        loading comments... <img src="<%loadingImage%>" alt="" /></div>\
+      <ul id="cl<%id%>" class="comment-ul"></ul>\
+      <div id="ca<%id%>">\
+      <p class="add-a-comment">Add a comment\
+        (<a href="#" class="comment-markup" id="ab<%id%>">markup</a>):</p>\
+      <div class="comment-markup-box" id="mb<%id%>">\
+        reStructured text markup: <i>*emph*</i>, <b>**strong**</b>, \
+        <code>``code``</code>, \
+        code blocks: <code>::</code> and an indented block after blank line</div>\
+      <form method="post" id="cf<%id%>" class="comment-form" action="">\
+        <textarea name="comment" cols="80"></textarea>\
+        <p class="propose-button">\
+          <a href="#" id="pc<%id%>" class="show-propose-change">\
+            Propose a change &#9657;\
+          </a>\
+          <a href="#" id="hc<%id%>" class="hide-propose-change">\
+            Propose a change &#9663;\
+          </a>\
+        </p>\
+        <textarea name="proposal" id="pt<%id%>" cols="80"\
+                  spellcheck="false"></textarea>\
+        <input type="submit" value="Add comment" />\
+        <input type="hidden" name="node" value="<%id%>" />\
+        <input type="hidden" name="parent" value="" />\
+      </form>\
+      </div>\
+    </div>';
+
+  var commentTemplate = '\
+    <div id="cd<%id%>" class="sphinx-comment<%css_class%>">\
+      <div class="vote">\
+        <div class="arrow">\
+          <a href="#" id="uv<%id%>" class="vote" title="vote up">\
+            <img src="<%upArrow%>" />\
+          </a>\
+          <a href="#" id="uu<%id%>" class="un vote" title="vote up">\
+            <img src="<%upArrowPressed%>" />\
+          </a>\
+        </div>\
+        <div class="arrow">\
+          <a href="#" id="dv<%id%>" class="vote" title="vote down">\
+            <img src="<%downArrow%>" id="da<%id%>" />\
+          </a>\
+          <a href="#" id="du<%id%>" class="un vote" title="vote down">\
+            <img src="<%downArrowPressed%>" />\
+          </a>\
+        </div>\
+      </div>\
+      <div class="comment-content">\
+        <p class="tagline comment">\
+          <span class="user-id"><%username%></span>\
+          <span class="rating"><%pretty_rating%></span>\
+          <span class="delta"><%time.delta%></span>\
+        </p>\
+        <div class="comment-text comment"><#text#></div>\
+        <p class="comment-opts comment">\
+          <a href="#" class="reply hidden" id="rl<%id%>">reply &#9657;</a>\
+          <a href="#" class="close-reply" id="cr<%id%>">reply &#9663;</a>\
+          <a href="#" id="sp<%id%>" class="show-proposal">proposal &#9657;</a>\
+          <a href="#" id="hp<%id%>" class="hide-proposal">proposal &#9663;</a>\
+          <a href="#" id="dc<%id%>" class="delete-comment hidden">delete</a>\
+          <span id="cm<%id%>" class="moderation hidden">\
+            <a href="#" id="ac<%id%>" class="accept-comment">accept</a>\
+          </span>\
+        </p>\
+        <pre class="proposal" id="pr<%id%>">\
+<#proposal_diff#>\
+        </pre>\
+          <ul class="comment-children" id="cl<%id%>"></ul>\
+        </div>\
+        <div class="clearleft"></div>\
+      </div>\
+    </div>';
+
+  var replyTemplate = '\
+    <li>\
+      <div class="reply-div" id="rd<%id%>">\
+        <form id="rf<%id%>">\
+          <textarea name="comment" cols="80"></textarea>\
+          <input type="submit" value="Add reply" />\
+          <input type="button" value="Cancel" />\
+          <input type="hidden" name="parent" value="<%id%>" />\
+          <input type="hidden" name="node" value="" />\
+        </form>\
+      </div>\
+    </li>';
+
+  $(document).ready(function() {
+    init();
+  });
+})(jQuery);
+
+$(document).ready(function() {
+  // add comment anchors for all paragraphs that are commentable
+  $('.sphinx-has-comment').comment();
+
+  // highlight search words in search results
+  $("div.context").each(function() {
+    var params = $.getQueryParameters();
+    var terms = (params.q) ? params.q[0].split(/\s+/) : [];
+    var result = $(this);
+    $.each(terms, function() {
+      result.highlightText(this.toLowerCase(), 'highlighted');
+    });
+  });
+
+  // directly open comment window if requested
+  var anchor = document.location.hash;
+  if (anchor.substring(0, 9) == '#comment-') {
+    $('#ao' + anchor.substring(9)).click();
+    document.location.hash = '#s' + anchor.substring(9);
+  }
+});

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/asset-and-files/assets.html
----------------------------------------------------------------------
diff --git a/content/docs/asset-and-files/assets.html b/content/docs/asset-and-files/assets.html
new file mode 100644
index 0000000..abb5884
--- /dev/null
+++ b/content/docs/asset-and-files/assets.html
@@ -0,0 +1,331 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>Assets &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>Assets</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/asset-and-files/assets.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="assets">
+<h1>Assets<a class="headerlink" href="#assets" title="Permalink to this headline">¶</a></h1>
+<p>Asset entities are used primarily in Apache Usergrid to manage binary
+data objects such as images, video, and audio content. However, an asset
+does not have to be used for a binary object. For example, assets can be
+used to model a file system.</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="14%" />
+<col width="9%" />
+<col width="77%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Property</th>
+<th class="head">Type</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>uuid</td>
+<td>UUID</td>
+<td>Asset’s unique entity ID</td>
+</tr>
+<tr class="row-odd"><td>type</td>
+<td>string</td>
+<td>&#8220;asset&#8221;</td>
+</tr>
+<tr class="row-even"><td>name</td>
+<td>string</td>
+<td>Asset name (mandatory)</td>
+</tr>
+<tr class="row-odd"><td>created</td>
+<td>long</td>
+<td><a class="reference external" href="http://en.wikipedia.org/wiki/Unix_time">UNIX timestamp</a> of entity creation</td>
+</tr>
+<tr class="row-even"><td>modified</td>
+<td>long</td>
+<td><a class="reference external" href="http://en.wikipedia.org/wiki/Unix_time">UNIX timestamp</a> of entity modification</td>
+</tr>
+<tr class="row-odd"><td>owner</td>
+<td>UUID</td>
+<td>UUID of the asset’s owner (mandatory)</td>
+</tr>
+<tr class="row-even"><td>path</td>
+<td>string</td>
+<td>Relative path to the asset (mandatory)</td>
+</tr>
+<tr class="row-odd"><td>content-type</td>
+<td>string</td>
+<td>Content type of the asset (for example, “image/jpeg”)</td>
+</tr>
+</tbody>
+</table>
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/asset-and-files/file-storage-configuration.html
----------------------------------------------------------------------
diff --git a/content/docs/asset-and-files/file-storage-configuration.html b/content/docs/asset-and-files/file-storage-configuration.html
new file mode 100644
index 0000000..8811793
--- /dev/null
+++ b/content/docs/asset-and-files/file-storage-configuration.html
@@ -0,0 +1,319 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>File storage configuration &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>File storage configuration</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/asset-and-files/file-storage-configuration.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="file-storage-configuration">
+<h1>File storage configuration<a class="headerlink" href="#file-storage-configuration" title="Permalink to this headline">¶</a></h1>
+<p>Usergrid can store your assets either on your hard drive or in the
+Amazon S3 cloud.</p>
+<div class="section" id="local-storage-configuration">
+<h2>Local storage configuration<a class="headerlink" href="#local-storage-configuration" title="Permalink to this headline">¶</a></h2>
+<p>By default assets are stored in the temporary folder /tmp/usergrid This
+can be changed by editing this file
+/stack/rest/src/main/resources/usergrid-rest-context.xml and replacing
+{usergrid.temp.files} by the wanted destination</p>
+<div class="code xml highlight-python"><div class="highlight"><pre>&lt;bean id=&quot;binaryStore&quot; class=&quot;org.apache.usergrid.services.assets.data.LocalFileBinaryStore&quot;&gt;
+  &lt;property name=&quot;reposLocation&quot; value=&quot;${usergrid.temp.files}&quot;/&gt;
+&lt;/bean&gt;
+</pre></div>
+</div>
+</div>
+<div class="section" id="aws-s3-configuration">
+<h2>AwS S3 configuration<a class="headerlink" href="#aws-s3-configuration" title="Permalink to this headline">¶</a></h2>
+<p>To use your AWS S3 storage you need to change the binaryStore classpath
+and add several constructor arguments in
+/stack/rest/src/main/resources/usergrid-rest-context.xml</p>
+<p>Some examples :</p>
+<div class="code xml highlight-python"><div class="highlight"><pre>&lt;bean id=&quot;binaryStore&quot; class=&quot;org.apache.usergrid.services.assets.data.AwsSdkS3BinaryStore&quot;&gt;
+  &lt;constructor-arg name=&quot;accessId&quot; value=&quot;x&quot; /&gt;
+  &lt;constructor-arg name=&quot;secretKey&quot; value=&quot;xx&quot; /&gt;
+  &lt;constructor-arg name=&quot;bucketName&quot; value=&quot;x&quot; /&gt;
+  &lt;constructor-arg name=&quot;regionName&quot; value=&quot;eu-central-1&quot; /&gt;
+&lt;/bean&gt;
+</pre></div>
+</div>
+<p>the regionName field is not mandatory, this code is also valid</p>
+<div class="code xml highlight-python"><div class="highlight"><pre>&lt;bean id=&quot;binaryStore&quot; class=&quot;org.apache.usergrid.services.assets.data.AwsSdkS3BinaryStore&quot;&gt;
+  &lt;constructor-arg name=&quot;accessId&quot; value=&quot;x&quot; /&gt;
+  &lt;constructor-arg name=&quot;secretKey&quot; value=&quot;xx&quot; /&gt;
+  &lt;constructor-arg name=&quot;bucketName&quot; value=&quot;x&quot; /&gt;
+&lt;/bean&gt;
+</pre></div>
+</div>
+<p>The filesize is limited to 50GB but you need to keep in mind that the
+file has to be stored on the hard drive before being sended to Amazon.</p>
+</div>
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

[39/60] [abbrv] incubator-usergrid git commit: cherry picking docs from master

[sn...@apache.org]

cherry picking docs from master


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/4a92ab09
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/4a92ab09
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/4a92ab09

Branch: refs/heads/two-dot-o-dev
Commit: 4a92ab0961c625d98d51793b0921f9c1af00b57d
Parents: 0bd37c9
Author: Dave Johnson <sn...@apache.org>
Authored: Wed Aug 5 10:55:15 2015 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Wed Aug 12 13:01:34 2015 -0400

----------------------------------------------------------------------
 content/README.md                               |     7 +
 content/community/index.html                    |   579 +
 content/docs/.gitkeep                           |     0
 content/docs/README.html                        |   370 +
 content/docs/_images/cassandra.png              |   Bin 0 -> 47467 bytes
 content/docs/_images/iOS10seeusermsg.jpg        |   Bin 0 -> 47979 bytes
 content/docs/_images/iOS1chooseapp.jpg          |   Bin 0 -> 43752 bytes
 content/docs/_images/iOS2register.jpg           |   Bin 0 -> 47339 bytes
 content/docs/_images/iOS5emptyfeed.jpg          |   Bin 0 -> 42009 bytes
 content/docs/_images/iOS6newmsg.jpg             |   Bin 0 -> 55357 bytes
 content/docs/_images/iOS7feed1msg.jpg           |   Bin 0 -> 45070 bytes
 content/docs/_images/login.png                  |   Bin 0 -> 162318 bytes
 content/docs/_images/portal1.png                |   Bin 0 -> 202277 bytes
 content/docs/_images/portal2.png                |   Bin 0 -> 178318 bytes
 content/docs/_images/portal3.png                |   Bin 0 -> 486403 bytes
 content/docs/_images/portal4.png                |   Bin 0 -> 166079 bytes
 content/docs/_images/portal5.png                |   Bin 0 -> 217950 bytes
 content/docs/_images/rdbms.png                  |   Bin 0 -> 40248 bytes
 content/docs/_images/reviews.png                |   Bin 0 -> 36333 bytes
 content/docs/_images/reviews2.png               |   Bin 0 -> 52726 bytes
 content/docs/_images/securitymodel0.png         |   Bin 0 -> 91321 bytes
 content/docs/_sources/README.txt                |    69 +
 .../docs/_sources/asset-and-files/assets.txt    |    20 +
 .../file-storage-configuration.txt              |    39 +
 .../docs/_sources/asset-and-files/folders.txt   |    85 +
 .../asset-and-files/legacy-asset-support.txt    |     0
 .../asset-and-files/retrieving-assets.txt       |    27 +
 .../asset-and-files/uploading-assets.txt        |    86 +
 .../creating-and-incrementing-counters.txt      |    74 +
 .../counters-and-events/events-and-counters.txt |     8 +
 .../counters-and-events/retrieving-counters.txt |   109 +
 .../data-queries/advanced-query-usage.txt       |    23 +
 .../data-queries/operators-and-types.txt        |   120 +
 .../_sources/data-queries/query-language.txt    |   427 +
 .../_sources/data-queries/query-parameters.txt  |   153 +
 .../data-queries/querying-your-data.txt         |   121 +
 .../docs/_sources/data-storage/collections.txt  |   254 +
 .../_sources/data-storage/data-store-dbms.txt   |   109 +
 content/docs/_sources/data-storage/entities.txt |   512 +
 .../_sources/data-storage/optimizing-access.txt |   185 +
 .../entity-connections/connecting-entities.txt  |    60 +
 .../disconnecting-entities.txt                  |    79 +
 .../entity-connections/relationships.txt        |    98 +
 .../entity-connections/retrieving-entities.txt  |    94 +
 .../docs/_sources/geolocation/geolocation.txt   |    72 +
 content/docs/_sources/geolocation/tbd.txt       |     1 +
 .../creating-a-new-application.txt              |    14 +
 .../getting-started/creating-account.txt        |    21 +
 .../getting-started/using-a-sandbox-app.txt     |    39 +
 .../_sources/getting-started/using-the-api.txt  |   150 +
 content/docs/_sources/index.txt                 |   160 +
 .../installation/ug1-deploy-to-tomcat.txt       |   179 +
 .../installation/ug1-launcher-quick-start.txt   |    72 +
 .../installation/ug2-deploy-to-tomcat.txt       |   167 +
 .../_sources/introduction/async-vs-sync.txt     |    25 +
 .../docs/_sources/introduction/data-model.txt   |    76 +
 .../_sources/introduction/usergrid-features.txt |    81 +
 .../docs/_sources/orgs-and-apps/admin-user.txt  |   352 +
 .../docs/_sources/orgs-and-apps/application.txt |   100 +
 .../docs/_sources/orgs-and-apps/managing.txt    |    50 +
 .../_sources/orgs-and-apps/organization.txt     |   435 +
 .../docs/_sources/push-notifications/tbd.txt    |     1 +
 .../push-notifications/users-devices.txt        |   108 +
 .../docs/_sources/reference/contribute-code.txt |    18 +
 .../_sources/reference/presos-and-videos.txt    |    31 +
 .../docs/_sources/rest-endpoints/api-docs.txt   |  3319 +
 content/docs/_sources/sdks/ios.txt              |     1 +
 content/docs/_sources/sdks/java.txt             |     1 +
 content/docs/_sources/sdks/javascript.txt       |     3 +
 content/docs/_sources/sdks/tbd.txt              |     1 +
 content/docs/_sources/sdks/usage.txt            |    16 +
 .../_sources/security-and-auth/app-security.txt |    19 +
 .../authenticating-api-requests.txt             |    38 +
 ...enticating-users-and-application-clients.txt |   128 +
 .../changing-token-time-live-ttl.txt            |    61 +
 .../security-and-auth/facebook-sign.txt         |   158 +
 .../revoking-tokens-logout.txt                  |    32 +
 .../security-and-auth/securing-your-app.txt     |    44 +
 .../user-authentication-types.txt               |    63 +
 .../security-and-auth/using-permissions.txt     |   115 +
 .../docs/_sources/user-management/activity.txt  |   440 +
 content/docs/_sources/user-management/group.txt |   365 +
 .../docs/_sources/user-management/groups.txt    |    38 +
 .../user-management/messagee-example.txt        |   137 +
 .../user-management/user-connections.txt        |    40 +
 .../user-management/user-management.txt         |    42 +
 .../user-management/working-user-data.txt       |   278 +
 content/docs/_static/ajax-loader.gif            |   Bin 0 -> 673 bytes
 content/docs/_static/basic.css                  |   599 +
 content/docs/_static/comment-bright.png         |   Bin 0 -> 3500 bytes
 content/docs/_static/comment-close.png          |   Bin 0 -> 3578 bytes
 content/docs/_static/comment.png                |   Bin 0 -> 3445 bytes
 content/docs/_static/css/badge_only.css         |     4 +
 content/docs/_static/css/badge_only.css.map     |     7 +
 content/docs/_static/css/theme.css              |  5514 +
 content/docs/_static/css/theme.css.map          |     7 +
 content/docs/_static/doctools.js                |   263 +
 content/docs/_static/down-pressed.png           |   Bin 0 -> 347 bytes
 content/docs/_static/down.png                   |   Bin 0 -> 347 bytes
 content/docs/_static/file.png                   |   Bin 0 -> 358 bytes
 content/docs/_static/fonts/FontAwesome.otf      |   Bin 0 -> 62856 bytes
 content/docs/_static/fonts/Inconsolata-Bold.ttf |   Bin 0 -> 47064 bytes
 content/docs/_static/fonts/Inconsolata.ttf      |   Bin 0 -> 63184 bytes
 content/docs/_static/fonts/Lato-Bold.ttf        |   Bin 0 -> 82368 bytes
 content/docs/_static/fonts/Lato-Regular.ttf     |   Bin 0 -> 81980 bytes
 content/docs/_static/fonts/RobotoSlab-Bold.ttf  |   Bin 0 -> 36596 bytes
 .../docs/_static/fonts/RobotoSlab-Regular.ttf   |   Bin 0 -> 36276 bytes
 .../docs/_static/fonts/fontawesome-webfont.eot  |   Bin 0 -> 38205 bytes
 .../docs/_static/fonts/fontawesome-webfont.svg  |   414 +
 .../docs/_static/fonts/fontawesome-webfont.ttf  |   Bin 0 -> 80652 bytes
 .../docs/_static/fonts/fontawesome-webfont.woff |   Bin 0 -> 44432 bytes
 content/docs/_static/jquery-1.11.1.js           | 10308 ++
 content/docs/_static/jquery.js                  |     4 +
 content/docs/_static/js/modernizr.min.js        |     4 +
 content/docs/_static/js/theme.js                |   131 +
 content/docs/_static/minus.png                  |   Bin 0 -> 173 bytes
 content/docs/_static/plus.png                   |   Bin 0 -> 173 bytes
 content/docs/_static/pygments.css               |    63 +
 content/docs/_static/searchtools.js             |   622 +
 content/docs/_static/underscore-1.3.1.js        |   999 +
 content/docs/_static/underscore.js              |    31 +
 content/docs/_static/up-pressed.png             |   Bin 0 -> 345 bytes
 content/docs/_static/up.png                     |   Bin 0 -> 345 bytes
 content/docs/_static/websupport.js              |   808 +
 content/docs/asset-and-files/assets.html        |   331 +
 .../file-storage-configuration.html             |   319 +
 content/docs/asset-and-files/folders.html       |   388 +
 .../asset-and-files/legacy-asset-support.html   |   277 +
 .../docs/asset-and-files/retrieving-assets.html |   356 +
 .../docs/asset-and-files/uploading-assets.html  |   416 +
 .../creating-and-incrementing-counters.html     |   406 +
 .../events-and-counters.html                    |   303 +
 .../retrieving-counters.html                    |   458 +
 .../docs/data-queries/advanced-query-usage.html |   321 +
 .../docs/data-queries/operators-and-types.html  |   461 +
 content/docs/data-queries/query-language.html   |   730 +
 content/docs/data-queries/query-parameters.html |   511 +
 .../docs/data-queries/querying-your-data.html   |   453 +
 content/docs/data-storage/collections.html      |   670 +
 content/docs/data-storage/data-store-dbms.html  |   423 +
 content/docs/data-storage/entities.html         |  1014 +
 .../docs/data-storage/optimizing-access.html    |   557 +
 .../entity-connections/connecting-entities.html |   378 +
 .../disconnecting-entities.html                 |   395 +
 .../docs/entity-connections/relationships.html  |   379 +
 .../entity-connections/retrieving-entities.html |   419 +
 content/docs/genindex.html                      |   282 +
 content/docs/geolocation/geolocation.html       |   413 +
 content/docs/geolocation/tbd.html               |   280 +
 .../creating-a-new-application.html             |   320 +
 .../docs/getting-started/creating-account.html  |   327 +
 .../getting-started/using-a-sandbox-app.html    |   357 +
 content/docs/getting-started/using-the-api.html |   491 +
 content/docs/index.html                         |   732 +
 .../docs/installation/ug1-deploy-to-tomcat.html |   506 +
 .../installation/ug1-launcher-quick-start.html  |   388 +
 .../docs/installation/ug2-deploy-to-tomcat.html |   509 +
 content/docs/introduction/async-vs-sync.html    |   341 +
 content/docs/introduction/data-model.html       |   449 +
 .../docs/introduction/usergrid-features.html    |   449 +
 content/docs/objects.inv                        |   Bin 0 -> 663 bytes
 content/docs/orgs-and-apps/admin-user.html      |   780 +
 content/docs/orgs-and-apps/application.html     |   495 +
 content/docs/orgs-and-apps/managing.html        |   340 +
 content/docs/orgs-and-apps/organization.html    |  1017 +
 content/docs/push-notifications/tbd.html        |   280 +
 .../docs/push-notifications/users-devices.html  |   537 +
 content/docs/reference/contribute-code.html     |   315 +
 content/docs/reference/presos-and-videos.html   |   335 +
 content/docs/rest-endpoints/api-docs.html       |  4192 +
 content/docs/sdks/ios.html                      |   280 +
 content/docs/sdks/java.html                     |   280 +
 content/docs/sdks/javascript.html               |   280 +
 content/docs/sdks/tbd.html                      |   291 +
 content/docs/sdks/usage.html                    |   308 +
 content/docs/search.html                        |   293 +
 content/docs/searchindex.js                     |     1 +
 .../docs/security-and-auth/app-security.html    |   320 +
 .../authenticating-api-requests.html            |   367 +
 ...nticating-users-and-application-clients.html |   528 +
 .../changing-token-time-live-ttl.html           |   389 +
 .../docs/security-and-auth/facebook-sign.html   |   506 +
 .../revoking-tokens-logout.html                 |   342 +
 .../security-and-auth/securing-your-app.html    |   398 +
 .../user-authentication-types.html              |   399 +
 .../security-and-auth/using-permissions.html    |   510 +
 content/docs/user-management/activity.html      |   867 +
 content/docs/user-management/group.html         |   824 +
 content/docs/user-management/groups.html        |   398 +
 .../docs/user-management/messagee-example.html  |   485 +
 .../docs/user-management/user-connections.html  |   358 +
 .../docs/user-management/user-management.html   |   372 +
 .../docs/user-management/working-user-data.html |   700 +
 content/index.html                              |   264 +
 content/releases/index.html                     |   235 +
 docs/README.md                                  |    49 +-
 docs/update-api-docs.sh                         |     4 +-
 docs/update-website.sh                          |     6 +
 website/README.md                               |    54 +
 website/content/community/index.html            |   240 +
 website/layouts/default.html                    |    44 +
 website/layouts/footer.html                     |    94 +
 website/layouts/header.html                     |   229 +
 website/tmp/checksums                           |     2 +
 website/tmp/compiled_content                    | 91671 +++++++++++++++++
 website/tmp/dependencies                        |   Bin 0 -> 2372 bytes
 206 files changed, 157440 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/README.md
----------------------------------------------------------------------
diff --git a/content/README.md b/content/README.md
new file mode 100644
index 0000000..0bbec7e
--- /dev/null
+++ b/content/README.md
@@ -0,0 +1,7 @@
+# Generated Website and Docs Content
+
+__DO NOT EDIT FILES IN THIS DIRECTORY__
+
+The files here were generated by tools in the ``/docs`` and ``/website`` directories.
+
+See the README files there for information about updating the docs and website.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/community/index.html
----------------------------------------------------------------------
diff --git a/content/community/index.html b/content/community/index.html
new file mode 100644
index 0000000..c78171e
--- /dev/null
+++ b/content/community/index.html
@@ -0,0 +1,579 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="utf-8">
+    <title>Apache Usergrid (incubating) — </title>
+    <meta http-equiv="x-ua-compatible" content="ie=edge" />
+    <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1" />
+    <meta name="keywords" content="Apache Usergrid, Usergrid, BaaS, Backend-as-a-Service">
+    <meta name="description" content="An open-source Backend-as-a-Service stack for web & mobile applications, based on RESTful APIs." />
+    <meta property="og:title" content="Apache Usergrid" />
+    <meta property="og:description" content="An open-source Backend-as-a-Service stack for web & mobile applications, based on RESTful APIs." />
+    <!-- Loading Typekit -->
+    <script type="text/javascript" src="//use.typekit.net/ddl7izx.js"></script>
+    <script type="text/javascript">try{Typekit.load();}catch(e){}</script>
+    <!-- Loading Bootstrap -->
+    <link href="/bootstrap/bootstrap.min.css" rel="stylesheet" type='text/css'>
+    <link href="/css/bootflat.css" rel="stylesheet" type='text/css'>
+    <link href="/css/usergrid-site.css" rel="stylesheet" type='text/css'>
+    <link href="https://fonts.googleapis.com/css?family=Open+Sans:200,400,500,300,600,800,700,400italic,600italic,700italic,800italic,300italic" rel="stylesheet" type="text/css">
+    <link href="/css/font-awesome.min.css" rel="stylesheet" type='text/css'>
+
+    
+    <script type="text/javascript"
+      src="https://maps.googleapis.com/maps/api/js?key=AIzaSyBYSxyIKS22zC4wSLFXZGR8QKXbGWLFwYw&sensor=false">
+    </script>
+    <script type="text/javascript">
+
+        var points = [
+                new google.maps.LatLng(-33.8674869,151.2069902),
+                new google.maps.LatLng(40.2338438,-111.6585337),
+                new google.maps.LatLng(37.6909682,-122.3107517),
+                new google.maps.LatLng(-37.6825027,176.1880232),
+                new google.maps.LatLng(-0.023559,37.906193),
+                new google.maps.LatLng(41.00527,28.97696),
+                new google.maps.LatLng(47.1569444,27.5902778),
+                new google.maps.LatLng(49.261226,-123.1139268),
+                new google.maps.LatLng(55.378051,-3.435973),
+                new google.maps.LatLng(30.3321838,-81.65565099999999),
+                new google.maps.LatLng(30.267153,-97.7430608),
+                new google.maps.LatLng(-14.235004,-51.92528),
+                new google.maps.LatLng(41.76371109999999,-72.6850932),
+                new google.maps.LatLng(53.3498053,-6.2603097),
+                new google.maps.LatLng(-37.814107,144.96328),
+                new google.maps.LatLng(26.820553,30.802498),
+                new google.maps.LatLng(34.0522342,-118.2436849),
+                new google.maps.LatLng(37.566535,126.9779692),
+                new google.maps.LatLng(7.873053999999999,80.77179699999999),
+                new google.maps.LatLng(39.737567,-104.9847179),
+                new google.maps.LatLng(52.9399159,-73.5491361),
+                new google.maps.LatLng(40.7143528,-74.00597309999999),
+                new google.maps.LatLng(44.9374831,-93.20099979999999),
+                new google.maps.LatLng(38.963745,35.243322),
+                new google.maps.LatLng(35.7795897,-78.6381787),
+                new google.maps.LatLng(35.907757,127.766922),
+                new google.maps.LatLng(-6.2689913,106.8060388),
+                new google.maps.LatLng(27.3364347,-82.53065269999999),
+                new google.maps.LatLng(44.494887,11.3426163),
+                new google.maps.LatLng(39.952335,-75.16378900000001),
+                new google.maps.LatLng(37.09024,-95.712891),
+                new google.maps.LatLng(40.5852602,-105.084423),
+                new google.maps.LatLng(43.653226,-79.3831843),
+                new google.maps.LatLng(47.6062095,-122.3320708),
+                new google.maps.LatLng(31.046051,34.851612),
+                new google.maps.LatLng(51.41233,-0.300689),
+                new google.maps.LatLng(39.4699075,-0.3762881),
+                new google.maps.LatLng(51.51121389999999,-0.1198244),
+                new google.maps.LatLng(42.3556899,-83.361853),
+                new google.maps.LatLng(33.4483771,-112.0740373),
+                new google.maps.LatLng(45.5234515,-122.6762071),
+                new google.maps.LatLng(43.0730517,-89.4012302),
+                new google.maps.LatLng(36.1031378,-80.202394),
+                new google.maps.LatLng(37.7749295,-122.4194155),
+                new google.maps.LatLng(5.263234100000001,100.4846227),
+                new google.maps.LatLng(35.5950581,-82.5514869),
+                new google.maps.LatLng(35.86166,104.195397),
+                new google.maps.LatLng(34.4208305,-119.6981901),
+                new google.maps.LatLng(1.352083,103.819836),
+                new google.maps.LatLng(36.8507689,-76.28587259999999),
+                new google.maps.LatLng(22.396428,114.109497),
+                new google.maps.LatLng(48.856614,2.3522219),
+                new google.maps.LatLng(40.4167754,-3.7037902),
+                new google.maps.LatLng(18.5204303,73.8567437),
+                new google.maps.LatLng(36.1666667,-86.7833333),
+                new google.maps.LatLng(53.3498053,-6.2603097),
+                new google.maps.LatLng(26.0993883,-80.1343301),
+                new google.maps.LatLng(42.331427,-83.0457538),
+                new google.maps.LatLng(37.82206000000001,-122.272437),
+                new google.maps.LatLng(30.42130899999999,-87.2169149),
+                new google.maps.LatLng(44.4325,26.1038889),
+                new google.maps.LatLng(41.0700485,-81.49516210000002),
+                new google.maps.LatLng(12.9715987,77.5945627),
+                new google.maps.LatLng(53.41291,-8.24389),
+                new google.maps.LatLng(34.0583995,-106.8914159),
+                new google.maps.LatLng(-9.189967,-75.015152),
+                new google.maps.LatLng(55.6760968,12.5683371),
+                new google.maps.LatLng(53.9807737,-6.7148821),
+                new google.maps.LatLng(31.230416,121.473701),
+                new google.maps.LatLng(33.7489954,-84.3879824),
+                new google.maps.LatLng(8.4874949,76.948623),
+                new google.maps.LatLng(13.0524139,80.25082460000002),
+                new google.maps.LatLng(28.0836269,-80.60810889999999),
+                new google.maps.LatLng(39.0457549,-76.64127119999999),
+                new google.maps.LatLng(17.385044,78.486671),
+                new google.maps.LatLng(-23.5489433,-46.6388182),
+                new google.maps.LatLng(52.09179,5.114569899999999),
+                new google.maps.LatLng(19.2667,76.7833),
+                new google.maps.LatLng(19.0759837,72.8776559),
+                new google.maps.LatLng(12.9715987,77.5945627),
+                new google.maps.LatLng(41.1566892,-8.6239254),
+                new google.maps.LatLng(39.90403,116.407526),
+                new google.maps.LatLng(42.3584308,-71.0597732),
+                new google.maps.LatLng(32.725409,-97.3208496),
+                new google.maps.LatLng(39.074208,21.824312),
+                new google.maps.LatLng(10.066049,123.538599),
+                new google.maps.LatLng(37.42410599999999,-122.1660756),
+                new google.maps.LatLng(36.204824,138.252924)
+              ];
+
+        var map;
+        var markers = [];
+        var iterator = 0;
+        var dropped = false;
+        var recentered = false;
+
+        function initialize() {
+            var mapOptions = {
+              center: new google.maps.LatLng(0,0),
+              //draggable: false,
+              //zoomControl: false,
+              scrollwheel: false,
+              streetViewControl: false,
+              mapTypeControl: false,
+              panControl: false,
+              //disableDoubleClickZoom: true,
+              zoom: 2,
+              //disableDefaultUI: true,
+              mapTypeId: google.maps.MapTypeId.ROADMAP
+            };
+            map = new google.maps.Map(document.getElementById("map-canvas"),
+                mapOptions);
+
+            google.maps.event.addDomListener(map, 'idle', function() {
+                        if (recentered == false) {
+                            map.setCenter(new google.maps.LatLng(20,0));
+                            recentered = true;
+                        }
+                    });
+
+            var bounds = new google.maps.LatLngBounds();
+
+            // Extend bounds with each point
+            for (var i = 0; i < points.length; i++) {
+            bounds.extend(points[i]);
+            }
+            map.fitBounds(bounds);
+
+            if (document.hasFocus()) {
+                dropped = true;
+                drop();
+            }
+
+
+        }
+        function drop() {
+            dropped = true;
+            for (var i = 0; i < points.length; i++) {
+                setTimeout(function() {
+                    addMarker();
+                }, i * 50);
+            }
+        }
+
+        function addMarker() {
+            markers.push(new google.maps.Marker({
+                position: points[iterator],
+                map: map,
+                draggable: false,
+                animation: google.maps.Animation.DROP
+            }));
+            iterator++;
+        }
+        
+        google.maps.event.addDomListener(window, 'load', initialize);
+        
+        window.onfocus = function () { 
+            if (dropped == false) {
+                drop(); 
+            }
+        };
+    </script>
+    
+
+    <!-- HTML5 shim, for IE6-8 support of HTML5 elements. All other JS at the end of file. -->
+    <!--[if lt IE 9]>
+      <script src="js/html5shiv.js"></script>
+      <script src="js/respond.min.js"></script>
+    <![endif]-->
+</head>
+<body>
+
+    <header class="navbar navbar-inverse navbar-fixed-top bf-docs-nav secondary" role="banner">
+    <div class="container">
+        <div class="navbar-header">
+            <button class="navbar-toggle" type="button" data-toggle="collapse" data-target=".bf-navbar-collapse">
+                <span class="sr-only">Toggle navigation</span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+            </button>
+        </div>
+        <a href="/" class="navbar-brand">
+                <img id="home-logo" src="/img/apache_usergrid_logo_white_small.png" />
+            </a>
+        <nav class="collapse navbar-collapse bf-navbar-collapse" role="navigation">
+            <ul class="nav navbar-nav navbar-right">
+                <li class="active"><a href="/community/"><span class="icns icon-group"></span></a></li>
+                <li><a href="docs" target="_blank"><span class="icns icon-book"></span></a></li>
+                <li><a href="http://github.com/apache/incubator-usergrid" target="_blank"><span class="icns icon-github-sign"></span></a></li>
+                <!--<li><a href="https://trello.com/b/exQmJIOn/usergrid" target="_blank"><span class="icns icon-trello"></span></a></li>-->
+                <li><a href="https://issues.apache.org/jira/secure/RapidBoard.jspa?rapidView=23&view=planning&selectedIssue=USERGRID-362&epics=visible" 
+                       target="_blank"><span class="icns icon-bug"></span></a></li>
+                <li><a href="http://stackoverflow.com/search?q=usergrid" target="_blank"><span class="icns icon-stackexchange"></span></a></li>
+                <li><a href="/community/#live"><span class="icns icon-comments"></span></a></li>
+                <!--<li><a href="https://groups.google.com/forum/#!forum/usergrid" target="_blank"><span class="icns icon-envelope"></span></a></li>-->
+                <li><a href="https://twitter.com/usergrid" target="_blank"><span class="icns icon-twitter"></span></a></li>
+                <li><a href="https://cwiki.apache.org/confluence/display/usergrid/" target="_blank"><span class="icns icon-wiki"></span></a></li>
+                <li><a href="/releases/"><span class="icns icon-releases"></span></a></li>
+            </ul>
+        </nav>
+    </div>
+    </header>
+
+
+
+
+
+<div id="map-canvas" style="width: 100%;"></div>
+
+<section class="bf-tagline">
+    <div class="container">
+    	<div class="row">
+    	    <div class="col-md-12">
+    	    	<h2>The Apache Usergrid community has members in 170+ cities in 30 countries on 6 continents</h2>
+			</div>
+		</div>
+	</div>
+</section>
+
+
+<section class="bf-community">
+    <div class="container">
+    	<div class="row">
+    	    <div class="col-md-12" id="events">
+    	    	<h2 class="icns-calendar"><span>Events</span></h2>
+			</div>
+		</div>
+		<div class="row">
+    	<div class="col-md-3 done">
+    	    	<h3><a href=http://events.linuxfoundation.org/events/apachecon-north-america/">ApacheCon Denver</a><small>April 7-9</small></h3>
+    	    	<p>Featuring our very own Dave Johnson who will deliver a talk on <a href="http://www.slideshare.net/snoopdave/how-to-contribute-to-apache-usergrid">"How to contribute to Apache Usergrid"</a><p>
+			</div>
+      <div class="col-md-3 done">
+        <h3>Seoul Hack Day #1 <small>January 24</small></h3>
+        <p>KT is hosting a Usergrid evening in Gangnam, Seoul, South Korea! <a href="http://onoffmix.com/event/22000">Register on OnOffMix.com</a><p>
+      </div>
+			<div class="col-md-3 done">
+    	    	<h3>SF Bay Area Meetup #1 <small>January 23</small></h3>
+    	    	<p>Can’t join us for the afternoon hack day? We’ll host an evening meetup right afterwards! Or join us for both! <a href="http://www.meetup.com/apache-usergrid-bay-area/events/155130862/">Register on Meetup.com</a><p>
+			</div>
+			<div class="col-md-3">
+				<h3>&nbsp;</h3>
+    	    	<p><i>Want to organize a Usergrid event? <a href="mailto:snoopdave@apache.org">Contact us!</a></i><p>
+			</div>
+		</div>
+	</div>
+</section>
+
+<section class="bf-community">
+    <div class="container">
+    	<div class="row">
+    	    <div class="col-md-12" id="live">
+    	    	<h2 class="icns-chat"><span>Live Chat</span></h2>
+			</div>
+		</div>
+		<div class="row">
+    	<div class="col-md-3 done">
+    	    	<h3><a href="https://www.hipchat.com/gDDIQrdQa">HipChat</a></h3>
+    	    	<p>Some of the Usergrid team hangs around in this HipChat Room: <a href="https://www.hipchat.com/gDDIQrdQa" target="_blank">https://www.hipchat.com/gDDIQrdQa</a>. Come by and chat for a spell!<p>
+		</div>
+      	<div class="col-md-3 done">
+        	<h3>IRC</h3>
+        	<p>Another (less used) option is the Usergrid IRC chat channel <a href="http://webchat.freenode.net/?channels=%23usergrid&uio=d4" target="_blank">#usergrid</a>.<p>
+      </div>
+	</div>
+</section>
+
+<section class="bf-community">
+    <div class="container">
+    	<div class="row">
+    	    <div class="col-md-12">
+    	    	<h2 class="icns-envelope" id="mailing-lists"><span>Mailing-lists</span></h2>
+			</div>
+		</div>
+		<div class="row">
+	    	<div class="col-md-4">
+	    		<h3>Users</h3>
+	    		<p><em>Perfect if you build apps against Apache Usergrid or deploy Apache Usergrid.</em></p>
+	    		<p>To subscribe, send a blank email to<br/><a href="mailto:user-subscribe@usergrid.incubator.apache.org">user-subscribe@usergrid.incubator.apache.org</a>.</p>
+	    		<p>You can also <a href="https://mail-archives.apache.org/mod_mbox/incubator-usergrid-user/">read the archives</a>.</p>
+			</div>
+	    	<div class="col-md-4">
+	    		<h3>Dev</h3>
+	    		<p><em>If you are building contributions & modifications to Apache Usergrid’s stack, portal, cli and SDKs, this is the list for you.</em><p>
+	    		<p>To subscribe, send a blank email to<br/><a href="mailto:dev-subscribe@usergrid.incubator.apache.org">dev-subscribe@usergrid.incubator.apache.org</a>.</p>
+	    		<p>You can also <a href="https://mail-archives.apache.org/mod_mbox/incubator-usergrid-dev/">read the archives</a>.</p>
+			</div>
+	    	<div class="col-md-4">
+	    		<h3>Commits</h3>
+	    		<p><em>This list receives an email whenever new code is contributed to Apache Usergrid.</em><p>
+	    		<p>To subscribe, send a blank email to<br/><a href="mailto:commits-subscribe@usergrid.incubator.apache.org">commits-subscribe@usergrid.incubator.apache.org</a>.</p>
+	    		<p>You can also <a href="https://mail-archives.apache.org/mod_mbox/incubator-usergrid-commits/">read the archives</a>.</p>
+			</div>
+		</div>
+	</div>
+</section>
+
+<section class="bf-community">
+    <div class="container">
+    	<div class="row">
+    	    <div class="col-md-12">
+    	    	<h2 class="icns-briefcase" id="deployments"><span>Deployments</span></h2>
+			</div>
+		</div>
+		<div class="row">
+			<a href="http://baas.io">
+	    	    <div class="col-md-3">
+	    	    	<h3>baas.io (Korea Telecom)</h3>
+	    	    	<p>Korea Telecom uses Apache Usergrid as the core of its public mobile application development platform baas.io, in operation since 2012.<p>
+				</div>
+			</a>
+			<a href="http://globo.com">
+				<div class="col-md-3">
+	    	    	<h3>Globo.com</h3>
+	    	    	<p>Brazilian media conglomerate Globo uses Apache Usergrid as part of its internal publishing platform for globo.com<p>
+				</div>
+			</a>
+			<a href="http://developers.apigee.com">
+				<div class="col-md-3">
+					<h3>Apigee</h3>
+	    	    	<p>Californian startup Apigee uses Apache Usergrid as a component of its cloud developer platform<p>
+				</div>
+			</a>
+			<a href="http://easemob.com">
+			<h3>Easemob</h3>
+    	    	<p>Easemob uses Apache Usergrid as part of its <a href="http://easemob.com">IM Cloud development platform</a>, which provides cloud service for app developers to integrate IM service in munites.<p> 
+			</div>
+			</a>
+			<div class="col-md-3">
+				<h3>&nbsp;</h3>
+    	    	<p><i>Want to be added to this list? <a href="mailto:snoopdave@apache.org">Contact us!</a></i><p>
+			</div>
+		</div>
+	</div>
+</section>
+
+<section class="bf-community committers">
+    <div class="container">
+    	<div class="row">
+    	    <div class="col-md-12">
+    	    	<h2 class="icns-group" id="committers"><span>Committers</span></h2>
+			</div>
+		</div>
+		<div class="row">
+			<div class="col-md-2 text-center">
+				<img src="/img/alberto.jpg" />
+				<p>Alberto Leal</p>
+			</div>
+			<div class="col-md-2 text-center">
+				<img src="/img/alex.png" />
+				<p>Alex Karasulu</p>
+			</div>
+			<div class="col-md-2 text-center">
+				<img src="/img/github.png" />
+				<p>Askhat Asanaliev</p>
+			</div>
+			<div class="col-md-2 text-center">
+				<img src="/img/dave.jpg" />
+				<p>Dave Johnson</p>
+			</div>
+			<div class="col-md-2 text-center">
+				<img src="/img/ed.jpg" />
+				<p>Ed Anuff</p>
+			</div>
+			<div class="col-md-2 text-center">
+				<img src="/img/github.png" />
+				<p>Furkan Bicak</p>
+			</div>
+		</div>
+		<div class="row">
+			<div class="col-md-2 text-center">
+				<img src="/img/grey.png" />
+				<p>George Reyes</p>
+			</div>
+			<div class="col-md-2 text-center">
+				<img src="/img/nate.jpg" />
+				<p>Nate McCall</p>
+			</div>
+			<div class="col-md-2 text-center">
+				<img src="/img/rod.jpg" />
+				<p>Rod Simpson</p>
+			</div>
+			<div class="col-md-2 text-center">
+				<img src="/img/scott.jpg" />
+				<p>Scott Ganyo</p>
+			</div>
+			<div class="col-md-2 text-center">
+				<img src="/img/stliu.jpg" />
+				<p>Shaozhuang Liu</p>
+			</div>
+            <div class="col-md-2 text-center">
+				<img src="/img/shawn.jpg" />
+				<p>Shawn Feldman</p>
+			</div>
+		</div>
+		<div class="row">
+			<div class="col-md-2 text-center">
+				<img src="/img/sungju.jpg" />
+				<p>Sungju Jin</p>
+			</div>
+			<div class="col-md-2 text-center">
+				<img src="/img/tim.jpg" />
+				<p>Tim Anglade</p>
+			</div>
+			<div class="col-md-2 text-center">
+				<img src="/img/todd.jpg" />
+				<p>Todd Nine</p>
+			</div>
+			<div class="col-md-2 text-center">
+				<img src="/img/github.png" />
+				<p>Yigit Sapli</p>
+			</div>
+			<div class="col-md-2 text-center">
+				<img src="/img/jeff.jpg" />
+				<p>Jeff West</p>
+			</div>
+			<div class="col-md-2 text-center">
+			</div>
+		</div>
+	</div>
+</section>
+
+<section class="bf-community tools">
+    <div class="container">
+    	<div class="row">
+    	    <div class="col-md-12">
+    	    	<h2 class="icns-tools" id="tools"><span>Tools</span></h2>
+			</div>
+		</div>
+		<div class="row">
+			<div class="col-md-2 text-center">
+				<a href="http://www.jetbrains.com/idea/" target="_blank"><img src="/img/intellij.png" /></a>
+				<p>IntelliJ IDEA</p>
+			</div>
+			<div class="col-md-2 text-center">
+				<a href="http://yourkit.com/" target="_blank"><img src="/img/yourkit.jpeg" /></a>
+				<p>YourKit Java Profiler</p>
+			</div>
+			<div class="col-md-2 text-center">
+				<a href="http://structure101.com/" target="_blank"><img src="/img/structure101.png" /></a>
+				<p>structure101</p>
+			</div>
+		</div>
+		These great companies have provided free product licenses to the Apache Usergrid team. We use these tools and love them.  Thank you!
+	</div>
+</section>
+
+
+
+
+<footer class="bf-footer" role="contentinfo">
+    <div class="container">
+        <div class="row">
+            <div class="col-md-2">
+                <ul class="nav nav-list">
+                    <li class="nav-header"><a href="/">Home</a></li>
+                    <li class="nav-header"><a href="/community/">Community</a></li>
+                        <li><a href="/community/#events">Events</a></li>
+                        <li><a href="/community/#mailing-lists">Mailing Lists</a></li>
+                        <li><a href="/community/#deployments">Deployments</a></li>
+                        <li><a href="/community/#committers">Commiters</a></li>
+                </ul>
+            </div>
+            <div class="col-md-2">
+                <ul class="nav nav-list">
+                    <li class="nav-header"><a href="https://github.com/apache/incubator-usergrid/" target="_blank">Code</a></li>
+                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/stack" target="_blank">Server Stack</a></li>
+                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/portal" target="_blank">Admin Portal</a></li>
+                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/ugc" target="_blank">ugc command line</a></li>
+                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/ios" target="_blank">iOS SDK</a></li>
+                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/android" target="_blank">Android SDK</a></li>
+                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/html5-javascript" target="_blank">HTML5/JS SDK</a></li>
+                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/nodejs" target="_blank">node.js module</a></li>
+                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/ruby-on-rails" target="_blank">Ruby on Rails gem</a></li>
+                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/ruby" target="_blank">Ruby gem</a></li>
+                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/php" target="_blank">PHP SDK</a></li>
+                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/java" target="_blank">Java SDK</a></li>
+                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/dotnet" target="_blank">.NET / Windows SDK</a></li>
+                </ul>
+            </div>
+            <div class="col-md-2">
+                <ul class="nav nav-list">
+                    <li class="nav-header">Resources</li>
+                    <li><a href="http://github.com/apache/incubator-usergrid" target="_blank">GitHub Code</a></li>
+                    <li><a href="docs" target="_blank">Docs</a></li>
+                    <li><a href="https://issues.apache.org/jira/secure/RapidBoard.jspa?rapidView=23&view=planning&selectedIssue=USERGRID-362&epics=visible" target="_blank">JIRA Bug Tracker</a></li>
+                    <li><a href="http://stackoverflow.com/search?q=usergrid" target="_blank">StackOverflow</a></li>
+                    <li><a href="/community/#live">Live Chat</a></li>
+                    <li><a href="https://twitter.com/usergrid" target="_blank">Twitter</a></li>
+                    <li><a href="http://incubator.apache.org/projects/usergrid.html" target="_blank">Podling Listing</a></li>
+                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/stack#requirements" target="_blank">Getting Started</a></li>
+                    <li><a href="https://cwiki.apache.org/confluence/display/usergrid/GitHub+Based+Contribution+Workflow" target="_blank">Contribution Guidelines</a></li>
+                </ul>
+            </div>
+            <div class="col-md-2">
+                <ul class="nav nav-list">
+                    <li class="nav-header">Apache</li>
+                    <li><a href="http://www.apache.org/licenses/" target="_blank">License</a></li>
+                    <li><a href="http://www.apache.org/foundation/sponsorship.html" target="_blank">Sponsorship</a></li>
+                    <li><a href="http://www.apache.org/foundation/thanks.html" target="_blank">Thanks</a></li>
+                    <li><a href="http://www.apache.org/security/">Security</a></li>
+                    <li><a href="http://www.apache.org/" target="_blank">Apache Foundation</a></li>
+                </ul>
+            </div>
+            <div class="col-md-4">
+                <a class="twitter-timeline" href="https://twitter.com/search?q=%23usergrid" data-widget-id="401499136807038976"  data-related="usergrid" height="400px" style="overflow:hidden">Tweets about "usergrid"</a>
+                <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
+            </div> 
+        <!--
+            <div class="col-md-4">
+                <div class="input-group form-search">
+                    <input type="text" class="form-control search-query">
+                    <span class="input-group-btn">
+                        <button type="submit" class="btn btn-primary" data-type="last">Search</button>
+                    </span>
+                </div>
+            </div> -->
+        </div> 
+        <div class="row">
+            <div id="copyright">
+                <img src="/img/egg-logo.png" /><br/><br/>
+                <p>Apache Usergrid is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.</p>
+                <p>Copyright © 2013 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.<br>
+                Apache and the Apache feather logos are trademarks of The Apache Software Foundation.</p>
+                <p class="credits">Site designed & assembled with love by <a href="https://github.com/ryuneeee">@ryuneeee</a> + <a href="https://github.com/realbeast">@realbeast</a> + <a href="https://twitter.com/timanglade">@timanglade</a> + <a href="https://twitter.com/snoopdave">@snoopdave</a> .</p>
+            </div>
+        </div>
+    </div>
+</footer>
+
+<script type="text/javascript" src="/js/head.js"></script>
+<script type="text/javascript">
+    head.js("/js/jquery-1.10.1.min.js", "/js/bootstrap.min.js", "/js/usergrid-site.js");
+</script>
+<script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+  ga('create', 'UA-45815079-1', 'apache.org');
+  ga('send', 'pageview');
+
+</script>
+
+
+
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/.gitkeep
----------------------------------------------------------------------
diff --git a/content/docs/.gitkeep b/content/docs/.gitkeep
new file mode 100644
index 0000000..e69de29

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/README.html
----------------------------------------------------------------------
diff --git a/content/docs/README.html b/content/docs/README.html
new file mode 100644
index 0000000..7abe7ff
--- /dev/null
+++ b/content/docs/README.html
@@ -0,0 +1,370 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>Apache Usergrid Documentation &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="index.html"/> 
+
+  
+  <script src="_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="data-queries/query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="data-queries/operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="security-and-auth/app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="security-and-auth/authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="user-management/user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="asset-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="asset-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="index.html">Docs</a> &raquo;</li>
+      
+    <li>Apache Usergrid Documentation</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="_sources/README.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="apache-usergrid-documentation">
+<h1>Apache Usergrid Documentation<a class="headerlink" href="#apache-usergrid-documentation" title="Permalink to this headline">¶</a></h1>
+<p>Usergrid documentation is written in
+<a class="reference external" href="https://help.github.com/articles/markdown-basics/">Markdown</a> (*.md)
+and RST (.rst) formats and we use the Python based
+<a class="reference external" href="http://sphinx-doc.org/">Sphinx-Docs</a> documentation system to
+transform our Markdown and RST files to HTML format.</p>
+<div class="section" id="prerequisites">
+<h2>Prerequisites<a class="headerlink" href="#prerequisites" title="Permalink to this headline">¶</a></h2>
+<p>Sphinx requires Python and pip. Once you have Python, you can install
+sphinx and pip like so:</p>
+<div class="highlight-python"><div class="highlight"><pre>$ sudo easy_install sphinx
+$ sudo easy_install pip
+</pre></div>
+</div>
+</div>
+<div class="section" id="how-to-change-update-the-usergrid-documentation">
+<h2>How to change/update the Usergrid documentation<a class="headerlink" href="#how-to-change-update-the-usergrid-documentation" title="Permalink to this headline">¶</a></h2>
+</div>
+<div class="section" id="how-to-build-the-usergrid-documentation-using-sphinx">
+<h2>How to build the Usergrid documentation using Sphinx<a class="headerlink" href="#how-to-build-the-usergrid-documentation-using-sphinx" title="Permalink to this headline">¶</a></h2>
+<p>Sphinx runs via a Makefile in this, the docs directory. So, cd to this
+directory and make html:</p>
+<div class="highlight-python"><div class="highlight"><pre>cd $usergrid/docs
+make clean html
+</pre></div>
+</div>
+</div>
+<div class="section" id="how-to-update-the-usergrid-docs">
+<h2>How to update the Usergrid docs<a class="headerlink" href="#how-to-update-the-usergrid-docs" title="Permalink to this headline">¶</a></h2>
+<p>Find the Markdown (.md) or reST (.rst) files that you need to change,
+edit them and then run <code class="docutils literal"><span class="pre">make</span> <span class="pre">clean</span> <span class="pre">html</span></code> to generate the HTML into the
+<code class="docutils literal"><span class="pre">target/html</span></code> directory, where you can preview your changes.</p>
+<div class="section" id="note-the-difference-between-rst-and-markdown-files">
+<h3>Note the difference between RST and Markdown files<a class="headerlink" href="#note-the-difference-between-rst-and-markdown-files" title="Permalink to this headline">¶</a></h3>
+<p>Note that Sphinx&#8217;s native format is
+<a class="reference external" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> (RST)
+and not Markdown. This causes some issues. For example, using Sphinx
+directives in Markdown files sometimes works and sometimes does not. RST
+is a different format than Markdown and it has a different set of
+directives, some very useful for organizing a large set of documentation
+files.</p>
+</div>
+<div class="section" id="updating-the-table-of-contents">
+<h3>Updating the Table of Contents<a class="headerlink" href="#updating-the-table-of-contents" title="Permalink to this headline">¶</a></h3>
+<p>The Table of Contents for the documentation is in index.rst, which ties
+everything together with a series of RST <strong>toctree</strong> directives. All
+other files should be written in Markdown, unless they need some special
+RST directives that will not work in Markdown.</p>
+</div>
+<div class="section" id="dealing-with-other-tables">
+<h3>Dealing with other tables<a class="headerlink" href="#dealing-with-other-tables" title="Permalink to this headline">¶</a></h3>
+<p>A note about tables. Markdown and reST do not have very good table
+support. Simple tables are easy to do and you can find examples (e.g.
+connecting-entities.md) but for tables with multiple lines in each cell,
+you&#8217;ll probably want to use a raw HTML table, and there are plenty of
+examples of that around too.</p>
+</div>
+</div>
+<div class="section" id="how-to-publish-the-usergrid-docs-to-usergrid-website">
+<h2>How to publish the Usergrid docs to Usergrid website<a class="headerlink" href="#how-to-publish-the-usergrid-docs-to-usergrid-website" title="Permalink to this headline">¶</a></h2>
+<p>To update the Usergrid website you must copy the udpated docs files from
+<code class="docutils literal"><span class="pre">target/html</span></code> directory to the website directory at the root of the
+Usergrid project, i.e. <code class="docutils literal"><span class="pre">${usergrid-project-dir}/website/docs</span></code>.</p>
+<p>You can do this by running the script <code class="docutils literal"><span class="pre">update-website.sh</span></code>.</p>
+<p>Once you&#8217;ve done that then you should follow the instructions in the
+website/README.md file, which explains how to update the website.</p>
+</div>
+<div class="section" id="updating-the-rest-api-reference">
+<h2>Updating the REST API reference<a class="headerlink" href="#updating-the-rest-api-reference" title="Permalink to this headline">¶</a></h2>
+<p>The REST API documentation in <code class="docutils literal"><span class="pre">rest-endpoints/api-docs.md</span></code> is
+generated from a Swagger file in the directory <code class="docutils literal"><span class="pre">src/main/resources</span></code>,
+so DO NOT edit that file directly.</p>
+<p>If you need to update the REST API docs, you should edit the
+usergrid-swagger.yaml file and then re-generate the file.</p>
+<p>If you need to change the formatting of the REST API docs, then you will
+need to edit the Mustache templates in <code class="docutils literal"><span class="pre">src/main/resource</span></code> and you may
+need to edit the Groovy script that does the generation:
+<code class="docutils literal"><span class="pre">src/main/groovy/usergrid.ApiDocGenerator</span></code>.</p>
+<p>You will need: * Groovy 2.x *
+<a class="reference external" href="https://github.com/spullara/mustache.java">Mustache.java</a></p>
+<p><strong>NOTE</strong>: Mustache.hava is not in Maven Central so unfortunately, you
+will have to Git Clone Mustache.java before you can run the generation
+script.</p>
+<p>This is the command to run the generation:</p>
+<div class="highlight-python"><div class="highlight"><pre>groovy src/main/groovy/usergrid.ApiDocGenerator.groovy
+</pre></div>
+</div>
+<p>The script will update the file <code class="docutils literal"><span class="pre">rest-endpoints/api-docs.md</span></code> and when
+you are happy with your update you should commit and push that file with
+Git.</p>
+</div>
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'./',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="_static/jquery.js"></script>
+      <script type="text/javascript" src="_static/underscore.js"></script>
+      <script type="text/javascript" src="_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_images/cassandra.png
----------------------------------------------------------------------
diff --git a/content/docs/_images/cassandra.png b/content/docs/_images/cassandra.png
new file mode 100644
index 0000000..ac72781
Binary files /dev/null and b/content/docs/_images/cassandra.png differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_images/iOS10seeusermsg.jpg
----------------------------------------------------------------------
diff --git a/content/docs/_images/iOS10seeusermsg.jpg b/content/docs/_images/iOS10seeusermsg.jpg
new file mode 100644
index 0000000..dfaee31
Binary files /dev/null and b/content/docs/_images/iOS10seeusermsg.jpg differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_images/iOS1chooseapp.jpg
----------------------------------------------------------------------
diff --git a/content/docs/_images/iOS1chooseapp.jpg b/content/docs/_images/iOS1chooseapp.jpg
new file mode 100644
index 0000000..e81153f
Binary files /dev/null and b/content/docs/_images/iOS1chooseapp.jpg differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_images/iOS2register.jpg
----------------------------------------------------------------------
diff --git a/content/docs/_images/iOS2register.jpg b/content/docs/_images/iOS2register.jpg
new file mode 100644
index 0000000..7666320
Binary files /dev/null and b/content/docs/_images/iOS2register.jpg differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_images/iOS5emptyfeed.jpg
----------------------------------------------------------------------
diff --git a/content/docs/_images/iOS5emptyfeed.jpg b/content/docs/_images/iOS5emptyfeed.jpg
new file mode 100644
index 0000000..6b03c67
Binary files /dev/null and b/content/docs/_images/iOS5emptyfeed.jpg differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_images/iOS6newmsg.jpg
----------------------------------------------------------------------
diff --git a/content/docs/_images/iOS6newmsg.jpg b/content/docs/_images/iOS6newmsg.jpg
new file mode 100644
index 0000000..0fe6164
Binary files /dev/null and b/content/docs/_images/iOS6newmsg.jpg differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_images/iOS7feed1msg.jpg
----------------------------------------------------------------------
diff --git a/content/docs/_images/iOS7feed1msg.jpg b/content/docs/_images/iOS7feed1msg.jpg
new file mode 100644
index 0000000..f64d378
Binary files /dev/null and b/content/docs/_images/iOS7feed1msg.jpg differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_images/login.png
----------------------------------------------------------------------
diff --git a/content/docs/_images/login.png b/content/docs/_images/login.png
new file mode 100644
index 0000000..565cf49
Binary files /dev/null and b/content/docs/_images/login.png differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_images/portal1.png
----------------------------------------------------------------------
diff --git a/content/docs/_images/portal1.png b/content/docs/_images/portal1.png
new file mode 100644
index 0000000..0298f12
Binary files /dev/null and b/content/docs/_images/portal1.png differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_images/portal2.png
----------------------------------------------------------------------
diff --git a/content/docs/_images/portal2.png b/content/docs/_images/portal2.png
new file mode 100644
index 0000000..71b787f
Binary files /dev/null and b/content/docs/_images/portal2.png differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_images/portal3.png
----------------------------------------------------------------------
diff --git a/content/docs/_images/portal3.png b/content/docs/_images/portal3.png
new file mode 100644
index 0000000..89136a9
Binary files /dev/null and b/content/docs/_images/portal3.png differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_images/portal4.png
----------------------------------------------------------------------
diff --git a/content/docs/_images/portal4.png b/content/docs/_images/portal4.png
new file mode 100644
index 0000000..be644e5
Binary files /dev/null and b/content/docs/_images/portal4.png differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_images/portal5.png
----------------------------------------------------------------------
diff --git a/content/docs/_images/portal5.png b/content/docs/_images/portal5.png
new file mode 100644
index 0000000..f8781c5
Binary files /dev/null and b/content/docs/_images/portal5.png differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_images/rdbms.png
----------------------------------------------------------------------
diff --git a/content/docs/_images/rdbms.png b/content/docs/_images/rdbms.png
new file mode 100644
index 0000000..ce9f2a7
Binary files /dev/null and b/content/docs/_images/rdbms.png differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_images/reviews.png
----------------------------------------------------------------------
diff --git a/content/docs/_images/reviews.png b/content/docs/_images/reviews.png
new file mode 100644
index 0000000..3acb39d
Binary files /dev/null and b/content/docs/_images/reviews.png differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_images/reviews2.png
----------------------------------------------------------------------
diff --git a/content/docs/_images/reviews2.png b/content/docs/_images/reviews2.png
new file mode 100644
index 0000000..85872f2
Binary files /dev/null and b/content/docs/_images/reviews2.png differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_images/securitymodel0.png
----------------------------------------------------------------------
diff --git a/content/docs/_images/securitymodel0.png b/content/docs/_images/securitymodel0.png
new file mode 100644
index 0000000..9f3ee82
Binary files /dev/null and b/content/docs/_images/securitymodel0.png differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/README.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/README.txt b/content/docs/_sources/README.txt
new file mode 100644
index 0000000..58ccf3b
--- /dev/null
+++ b/content/docs/_sources/README.txt
@@ -0,0 +1,69 @@
+# Apache Usergrid Documentation
+
+Usergrid documentation is written in [Markdown](https://help.github.com/articles/markdown-basics/) (*.md) and RST (.rst) formats and we use the Python based [Sphinx-Docs](http://sphinx-doc.org/) documentation system to transform our Markdown and RST files to HTML format.
+
+## Prerequisites
+
+Sphinx requires Python and pip. Once you have Python, you can install sphinx and pip like so:
+
+	$ sudo easy_install sphinx
+	$ sudo easy_install pip
+
+## How to change/update the Usergrid documentation 
+
+
+
+## How to build the Usergrid documentation using Sphinx
+
+Sphinx runs via a Makefile in this, the docs directory. So, cd to this directory and make html:
+
+	cd $usergrid/docs
+	make clean html
+
+## How to update the Usergrid docs 
+
+Find the Markdown (.md) or reST (.rst) files that you need to change, edit them and then run ``make clean html`` to generate the HTML into the ``target/html`` directory, where you can preview your changes. 
+
+### Note the difference between RST and Markdown files
+
+Note that Sphinx's native format is [reStructuredText](http://docutils.sourceforge.net/rst.html) (RST) and not Markdown. This causes some issues. For example, using Sphinx directives in Markdown files sometimes works and sometimes does not. RST is a different format than Markdown and it has a different set of directives, some very useful for organizing a large set of documentation files.
+
+### Updating the Table of Contents
+
+The Table of Contents for the documentation is in index.rst, which ties everything together
+with a series of RST __toctree__ directives. All other files should be written in Markdown,
+unless they need some special RST directives that will not work in Markdown.
+
+### Dealing with other tables
+
+A note about tables. Markdown and reST do not have very good table support. Simple tables are easy to do and you can find examples (e.g. connecting-entities.md) but for tables with multiple lines in each cell, you'll probably want to use a raw HTML table, and there are plenty of examples of that around too.
+
+## How to publish the Usergrid docs to Usergrid website
+
+To update the Usergrid website you must copy the udpated docs files from ``target/html`` directory to the website directory at the root of the Usergrid project, i.e. ``${usergrid-project-dir}/website/docs``.
+
+You can do this by running the script ``update-website.sh``.
+
+Once you've done that then you should follow the instructions in the website/README.md file, which explains how to update the website.
+
+## Updating the REST API reference
+
+The REST API documentation in ``rest-endpoints/api-docs.md`` is generated from a Swagger file in the 
+directory ``src/main/resources``, so DO NOT edit that file directly.
+
+If you need to update the REST API docs, you should edit the usergrid-swagger.yaml file and then
+ re-generate the file. 
+
+If you need to change the formatting of the REST API docs, then you will need to edit the Mustache templates in ``src/main/resource`` and you may need to edit the Groovy script that does the generation: ``src/main/groovy/usergrid.ApiDocGenerator``.
+ 
+You will need:
+* Groovy 2.x
+* [Mustache.java](https://github.com/spullara/mustache.java) 
+
+__NOTE__: Mustache.hava is not in Maven Central so unfortunately, you will have to Git Clone Mustache.java before you can run the generation script.
+
+This is the command to run the generation:
+
+	groovy src/main/groovy/usergrid.ApiDocGenerator.groovy
+	
+The script will update the file ``rest-endpoints/api-docs.md`` and when you are happy with your update you should commit and push that file with Git.

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/asset-and-files/assets.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/asset-and-files/assets.txt b/content/docs/_sources/asset-and-files/assets.txt
new file mode 100644
index 0000000..ea7291c
--- /dev/null
+++ b/content/docs/_sources/asset-and-files/assets.txt
@@ -0,0 +1,20 @@
+# Assets
+
+Asset entities are used primarily in Apache Usergrid to manage binary data
+objects such as images, video, and audio content. However, an asset does
+not have to be used for a binary object. For example, assets can be used
+to model a file system.
+
+
+  Property       Type     Description
+  -------------- -------- ---------------------------------------------------------------------------------
+  uuid           UUID     Asset’s unique entity ID
+  type           string   "asset"
+  name           string   Asset name (mandatory)
+  created        long     [UNIX timestamp](http://en.wikipedia.org/wiki/Unix_time) of entity creation
+  modified       long     [UNIX timestamp](http://en.wikipedia.org/wiki/Unix_time) of entity modification
+  owner          UUID     UUID of the asset’s owner (mandatory)
+  path           string   Relative path to the asset (mandatory)
+  content-type   string   Content type of the asset (for example, “image/jpeg”)
+
+ 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/asset-and-files/file-storage-configuration.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/asset-and-files/file-storage-configuration.txt b/content/docs/_sources/asset-and-files/file-storage-configuration.txt
new file mode 100644
index 0000000..c56265a
--- /dev/null
+++ b/content/docs/_sources/asset-and-files/file-storage-configuration.txt
@@ -0,0 +1,39 @@
+# File storage configuration
+
+Usergrid can store your assets either on your hard drive or in the Amazon S3 cloud.
+
+Local storage configuration
+---
+
+By default assets are stored in the temporary folder /tmp/usergrid
+This can be changed by editing this file /stack/rest/src/main/resources/usergrid-rest-context.xml and replacing {usergrid.temp.files} by the wanted destination
+```xml
+<bean id="binaryStore" class="org.apache.usergrid.services.assets.data.LocalFileBinaryStore">
+  <property name="reposLocation" value="${usergrid.temp.files}"/>
+</bean>
+```
+
+AwS S3 configuration
+---
+
+To use your AWS S3 storage you need to change the binaryStore classpath and add several constructor arguments in /stack/rest/src/main/resources/usergrid-rest-context.xml
+
+Some examples :
+```xml
+<bean id="binaryStore" class="org.apache.usergrid.services.assets.data.AwsSdkS3BinaryStore">
+  <constructor-arg name="accessId" value="x" />
+  <constructor-arg name="secretKey" value="xx" />
+  <constructor-arg name="bucketName" value="x" />
+  <constructor-arg name="regionName" value="eu-central-1" />
+</bean>
+```
+the regionName field is not mandatory, this code is also valid
+```xml
+<bean id="binaryStore" class="org.apache.usergrid.services.assets.data.AwsSdkS3BinaryStore">
+  <constructor-arg name="accessId" value="x" />
+  <constructor-arg name="secretKey" value="xx" />
+  <constructor-arg name="bucketName" value="x" />
+</bean>
+```
+
+The filesize is limited to 50GB but you need to keep in mind that the file has to be stored on the hard drive before being sended to Amazon.

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/asset-and-files/folders.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/asset-and-files/folders.txt b/content/docs/_sources/asset-and-files/folders.txt
new file mode 100644
index 0000000..7c425be
--- /dev/null
+++ b/content/docs/_sources/asset-and-files/folders.txt
@@ -0,0 +1,85 @@
+# Folders
+
+## Linking a folder to an asset
+In order to access the asset for the image in the folder, you need to link the folder to the asset. You can do that by issuing a POST request in the following format:
+
+    POST /{org-uuid}/{app-uuid}/folders/{folder-uuid}/assets/{assets_id}
+    
+where ``{folder-uuid}`` is the UUID of the folder, and ``{assets-uuid}`` is the UUID of the assets entity.
+
+Here’s how you could link the folder and the asset you created for the my-image.jpg image:
+
+    POST https://api.usergrid.com/my-org/my-app/folders/6640a601-2ac6-11e2-92c3-02e81ae640dc/assets/9501cda1-2d21-11e2-b4c6-02e81ac5a17b 
+    
+In the response, you should see the assets entity for the image added to the folder:
+
+    {
+      "action": "post",
+      "application": "3400ba10-cd0c-11e1-bcf7-12313d1c4491",
+      "params": {},
+      "path": "/folders/6640a601-2ac6-11e2-92c3-02e81ae640dc/assets",
+      "uri": "https://api.usergrid.com/my-org/my-app/folders/6640a601-2ac6-11e2-92c3-02e81ae640dc/assets",
+      "entities": [
+        {
+          "uuid": "9501cda1-2d21-11e2-b4c6-02e81ac5a17b",
+          "type": "asset",
+          "name": "my-image.jpg",
+          "created": 1352763303163,
+          "modified": 1352763303163,
+          "metadata": {
+            "path": "/folders/6640a601-2ac6-11e2-92c3-02e81ae640dc/assets/9501cda1-2d21-11e2-b4c6-02e81ac5a17b"
+          },
+          "owner": "5c0c1789-d503-11e1-b36a-12313b01d5c1",
+          "path": "/myassets/asset1"
+        }
+      ],
+      "timestamp": 1352830448045,
+      "duration": 54,
+      "organization": "my-org”,
+      "applicationName": "my-app"
+    }
+    
+## Retrieve list of folder assets
+You can also request a list of the linked contents of the folder like this:
+
+    GET https://api.usergrid.com/my-org/my-app/folders/6640a601-2ac6-11e2-92c3-02e81ae640dc/assets
+    
+The response should look something like this:
+
+    {
+      "action": "get",
+      "application": "3400ba10-cd0c-11e1-bcf7-12313d1c4491",
+      "params": {
+        "_": [
+          "1352830364891"
+        ]
+      },
+      "path": "/folders/6640a601-2ac6-11e2-92c3-02e81ae640dc/assets",
+      "uri": "https://api.usergrid.com/my-org/my-app/folders/6640a601-2ac6-11e2-92c3-02e81ae640dc/assets",
+      "entities": [
+        {
+          "uuid": "7bf47435-2ac8-11e2-b4c6-02e81ac5a17b",
+          "type": "asset",
+          "name": "my-image.jpg",
+          "created": 1352505133598,
+          "modified": 1352507245108,
+          "checksum": "8e0cd3866ee20746c99e9a9825f38ad8",
+          "content-length": 11853,
+          "content-type": "image/jpeg",
+          "etag": "\"8e0cd3866ee20746c99e9a9825f38ad8\"",
+          "metadata": {
+            "connecting": {
+              "assets": "/folders/6640a601-2ac6-11e2-92c3-02e81ae640dc/assets/7bf47435-2ac8-11e2-b4c6-02e81ac5a17b/connecting/assets"
+            },
+            "connection": "assets",
+            "path": "/folders/6640a601-2ac6-11e2-92c3-02e81ae640dc/assets/7bf47435-2ac8-11e2-b4c6-02e81ac5a17b"
+          },
+          "owner": "5c0c1789-d503-11e1-b36a-12313b01d5c1",
+          "path": "my-image"
+        }
+      ],
+      "timestamp": 1352830363797,
+      "duration": 57,
+      "organization": "my-org",
+      "applicationName": "my-app"
+    }

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/asset-and-files/legacy-asset-support.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/asset-and-files/legacy-asset-support.txt b/content/docs/_sources/asset-and-files/legacy-asset-support.txt
new file mode 100644
index 0000000..e69de29

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/asset-and-files/retrieving-assets.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/asset-and-files/retrieving-assets.txt b/content/docs/_sources/asset-and-files/retrieving-assets.txt
new file mode 100644
index 0000000..9313ae8
--- /dev/null
+++ b/content/docs/_sources/asset-and-files/retrieving-assets.txt
@@ -0,0 +1,27 @@
+# Retrieving assets
+
+## Retrieving asset data
+
+To retrieve the asset from an entity, send a ``GET`` request with the ``Accept`` header set to the content type of the asset. The content type can be retrieved from the ``file-metadata.content-type`` property of the entity the asset is attached to.
+
+### Request syntax
+
+    curl -X GET -H 'Accept: <content_type>' 'https://api.usergrid.com/<org>/<app>/<collection>/<entity>
+
+Parameters
+
+Parameter	     Description
+---------        -----------
+content_type	 The content type of the attached asset. For example, text/plain, image/jpeg.
+org	Organization UUID or organization name
+app	Application  UUID or application name
+collection	     Name or UUID of the collection of the entity the asset is attached to.
+entity	         Name or UUID of the entity the asset is attached to.
+
+### Example request
+The following request will retrieve the data for a jpeg file attached to an entity named 'cloud' in the 'pictures' collection:
+
+    curl -X GET -H 'Accept: image/jpeg' 'https://api.usergrid.com/your-org/your-app/pictures/cloud
+    
+## Retrieving an asset entity
+To retrieve the entity that an asset is attached to, perform a ``GET`` request as you normally would to retrieve an entity. For more information, see [Retrieving Data Entities](../data-storage/entities.html#retrieving-data-entities).
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/asset-and-files/uploading-assets.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/asset-and-files/uploading-assets.txt b/content/docs/_sources/asset-and-files/uploading-assets.txt
new file mode 100644
index 0000000..c5b836f
--- /dev/null
+++ b/content/docs/_sources/asset-and-files/uploading-assets.txt
@@ -0,0 +1,86 @@
+# Uploading assets
+
+With Usergrid, you can store and retrieve files and assets that hold data objects such as images, video, and audio content.
+
+Usergrid manages these objects as Asset entities. Optionally, you can use Folder entities to organize related assets.
+
+## Uploading assets
+Assets can be any file type and can be attached to any entity. When an asset is uploaded, Usergrid will automatically detect the file metadata for the asset and save it in the associated entity as a ``file-metadata`` property. Only 1 asset can be attached to an entity.
+
+To attach an asset to an entity, do the following:
+
+### Request syntax
+
+    curl -X POST -F name='<filename>' -F file=@<file_location> 'https://api.usergrid.com/<org>/<app>/<collection>/<entity>
+    
+Parameters
+
+Parameter	        Description
+---------           -----------
+filename	        A filename to associate with the asset.
+file_location	    The location of the asset to be uploaded.
+org	Organization    UUID or organization name
+app	Application     UUID or application name
+collection	        Name or UUID of the collection of the entity you want to attach the asset to.
+entity	            Name or UUID of an existing entity you want to attach the asset to.
+
+### Example request
+
+    curl -X POST -i -F name='clouds' -F file=@happy_clouds.jpg 'https://api.usergrid.com/your-org/your-app/pictures/'
+    
+### Example response
+
+Notice the ``file-metadata`` property in the response.
+
+    {
+        "action" : "post",
+        "application" : "f34f4222-a166-11e2-a7f7-02e81adcf3d0",
+        "params" : { },
+        "path" : "/users",
+        "uri" : "https://api.usergrid.com/amuramoto/sandbox/pictures",
+        "entities" : [ {
+        "uuid" : "410b213a-b379-11e3-a0e5-9953085ea376",
+        "type" : "user",
+        "name" : "test",
+        "created" : 1395681911491,
+        "modified" : 1399069838919,
+        "name" : "clouds",    
+        "file" : "fobnszewobnioerabnoiawegbrn\n",
+        "file-metadata" : {
+          "content-type" : "image/jpeg",
+          "etag" : "\"2e1db7299b0a667ed80e674a0ef9d653\"",
+          "last-modified" : 1399070010115,
+          "content-length" : 28,
+          "checksum" : "2e1db7299b0a667ed80e674a0ef9d653"
+        },
+        "metadata" : {
+          "connecting" : {        
+            "likes" : "/users/410b213a-b379-11e3-a0e5-9953085ea376/connecting/likes"
+          },
+          "path" : "/users/410b213a-b379-11e3-a0e5-9953085ea376",
+          "sets" : {
+            "rolenames" : "/users/410b213a-b379-11e3-a0e5-9953085ea376/roles",
+            "permissions" : "/users/410b213a-b379-11e3-a0e5-9953085ea376/permissions"
+          },
+          "connections" : {
+            "follows" : "/users/410b213a-b379-11e3-a0e5-9953085ea376/follows"
+          },
+          "collections" : {
+            "activities" : "/users/410b213a-b379-11e3-a0e5-9953085ea376/activities",
+            "devices" : "/users/410b213a-b379-11e3-a0e5-9953085ea376/devices",
+            "feed" : "/users/410b213a-b379-11e3-a0e5-9953085ea376/feed",
+            "groups" : "/users/410b213a-b379-11e3-a0e5-9953085ea376/groups",
+            "roles" : "/users/410b213a-b379-11e3-a0e5-9953085ea376/roles",
+            "following" : "/users/410b213a-b379-11e3-a0e5-9953085ea376/following",
+            "followers" : "/users/410b213a-b379-11e3-a0e5-9953085ea376/followers"
+          }
+        }
+        } ],
+        "timestamp" : 1399070009986,
+        "duration" : 441,
+        "organization" : "your-org",
+        "applicationName" : "your-app"
+    }
+
+## Updating assets
+To update the data for an asset, perform the same request outlined above in 'Uploading assets' as a ``PUT`` request rather than a ``POST``.

[54/60] [abbrv] incubator-usergrid git commit: Minor refactoring in API doc generation.

[sn...@apache.org]

Minor refactoring in API doc generation.

(cherry picked from commit fc52c0e0e036562d4928ebf2e5a83e07c9cfa6aa)


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/cbd78b6a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/cbd78b6a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/cbd78b6a

Branch: refs/heads/two-dot-o-dev
Commit: cbd78b6a3810c7a13735b5f26125f393186d1e58
Parents: 780e3f2
Author: Dave Johnson <sn...@apache.org>
Authored: Fri Aug 7 13:50:56 2015 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Wed Aug 12 13:02:48 2015 -0400

----------------------------------------------------------------------
 content/docs/rest-endpoints/api-reference.html  | 2350 +++++++-----------
 docs/rest-endpoints/api-docs.md                 |   57 +-
 .../main/groovy/usergrid/ApiDocGenerator.groovy |   43 +-
 docs/src/main/resources/file-end-html.mustache  |   13 -
 .../src/main/resources/file-start-html.mustache |   21 -
 docs/src/main/resources/html/file-end.mustache  |   13 +
 .../src/main/resources/html/file-start.mustache |   21 +
 docs/src/main/resources/html/model.mustache     |   38 +
 docs/src/main/resources/html/operation.mustache |   43 +
 .../main/resources/markdown/file-start.mustache |   13 +
 docs/src/main/resources/markdown/model.mustache |   21 +
 .../main/resources/markdown/operation.mustache  |   21 +
 docs/src/main/resources/model-html.mustache     |   38 -
 docs/src/main/resources/model.mustache          |   21 -
 docs/src/main/resources/operation-html.mustache |   43 -
 docs/src/main/resources/operation.mustache      |   21 -
 docs/update-api-docs.sh                         |    2 +-
 17 files changed, 1130 insertions(+), 1649 deletions(-)
----------------------------------------------------------------------

[20/60] [abbrv] incubator-usergrid git commit: cherry picking docs from master

[sn...@apache.org]

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/data-storage/optimizing-access.html
----------------------------------------------------------------------
diff --git a/content/docs/data-storage/optimizing-access.html b/content/docs/data-storage/optimizing-access.html
new file mode 100644
index 0000000..43e215b
--- /dev/null
+++ b/content/docs/data-storage/optimizing-access.html
@@ -0,0 +1,557 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>Data Store Best Practices &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+        <link rel="next" title="Collections" href="collections.html"/>
+        <link rel="prev" title="The Usergrid Data Store" href="data-store-dbms.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">Data Store Best Practices</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#put-your-data-in-as-you-ll-want-to-get-it-out">Put your data in as you&#8217;ll want to get it out</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#best-practice-denormalize-for-pre-computed-query-results">Best practice: Denormalize for pre-computed query results</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#getting-review-data-the-relational-way">Getting review data the relational way</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#using-a-denormalized-model-to-store-then-retrieve-data">Using a denormalized model to store (then retrieve) data</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>Data Store Best Practices</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/data-storage/optimizing-access.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="data-store-best-practices">
+<h1>Data Store Best Practices<a class="headerlink" href="#data-store-best-practices" title="Permalink to this headline">¶</a></h1>
+<p>The Usergrid data store is backed by Cassandra, an open source
+distributed DBMS. Cassandra is specifically designed to support
+applications that need flexibility and high scalability, particularly
+web and mobile applications. To get the most out of your Usergrid
+application, you should optimize your data access with this kind of
+database in mind.</p>
+<div class="section" id="put-your-data-in-as-you-ll-want-to-get-it-out">
+<h2>Put your data in as you&#8217;ll want to get it out<a class="headerlink" href="#put-your-data-in-as-you-ll-want-to-get-it-out" title="Permalink to this headline">¶</a></h2>
+<p>The best practices described here are all related to the theme of
+putting your data in the way you’ll want to get it out. You’ll model
+your data with your likely read requests in mind rather than by modeling
+around the structure of the data itself (as you might with a relational
+database). In many cases, you can avoid using queries that are
+inefficient for this kind of database.</p>
+<p>You can use the following techniques to optimize data store access:</p>
+<ul class="simple">
+<li><strong>Denormalize and duplicate</strong>. By creating a data model that
+strategically denormalizes and duplicates data, you can avoid costly
+queries. In other words, you model the data so that all of the data
+for a given request is all in one place rather than scattered in a
+way that a query must account for.</li>
+<li><strong>Create direct paths to the data you’ll want</strong>. You can optimize
+your app’s performance by connecting entities your code retrieves
+most often. With connections, you can avoid some queries that might
+add complexity and reduce performance.</li>
+</ul>
+</div>
+<div class="section" id="best-practice-denormalize-for-pre-computed-query-results">
+<h2>Best practice: Denormalize for pre-computed query results<a class="headerlink" href="#best-practice-denormalize-for-pre-computed-query-results" title="Permalink to this headline">¶</a></h2>
+<p>If you’re familiar with designing relational databases, you’re probably
+used to normalizing the structure of your data as much as possible. When
+normalizing an RDBMS data model, you minimize redundancy by ensuring
+that a column from one table is duplicated only once in any other table,
+and only when necessary to create primary/secondary key relationships.
+You then retrieve data that spans tables by joining them with an SQL
+query.</p>
+<p>In contrast, with the Usergrid data store you’ll get better performance
+by strategically denormalizing and duplicating data. When you
+denormalize, you combine data from what might (in a relational model)
+have been separate tables. When duplicating, you intentionally maintain
+copies of certain entity properties across multiple entities. By
+denormalizing and duplicating, you can collect the results of requests
+into a single entity rather than relying on a query.</p>
+<p>Part of designing your data model should include identifying the queries
+your client will make. Then in your data model design, you capture the
+results of those queries in advance by writing that data into entities
+of one collection you can read from later.</p>
+<div class="section" id="getting-review-data-the-relational-way">
+<h3>Getting review data the relational way<a class="headerlink" href="#getting-review-data-the-relational-way" title="Permalink to this headline">¶</a></h3>
+<p>For example, take a closer look at the relational case through a product
+database. Imagine you want to present a list of all reviews for a
+product. When a user chooses a review from the list, you’ll show them a
+view that includes the review’s title, body, and rating; the product it
+describes; and who wrote the review. That way, your user will be able to
+click through to more information about the product or reviewing user.</p>
+<p>In a relational database, you’d likely have separate tables for the
+review-specific information and a rating; for the product; and for the
+user. Your reviews table would include secondary keys with which to join
+reviews to the users and products tables. Maybe something like this:</p>
+<img alt="../_images/reviews.png" src="../_images/reviews.png" />
+<p>To get the data you need, your query might look like the SQL query
+below. By getting UUIDs for the user and product into your client code,
+you’re able to give the user a way to get user and product information
+from the review.</p>
+<div class="highlight-python"><div class="highlight"><pre>SELECT review.title, review.body, review.rating, review.uuid,
+    user.name, user.uuid, product.name, product.uuid
+    FROM reviews
+    INNER JOIN users
+    ON users.uuid = reviews.authorId
+    INNER JOIN products
+    ON products.uuid = reviews.productId
+    WHERE reviews.uuid = &lt;uuid_for_selected_review&gt;
+</pre></div>
+</div>
+<p>But due to Cassandra’s distributed, high-scale design, a join such as
+this wouldn’t work. So in the Usergrid, you’d get the data by first
+storing it all in one place.</p>
+</div>
+<div class="section" id="using-a-denormalized-model-to-store-then-retrieve-data">
+<h3>Using a denormalized model to store (then retrieve) data<a class="headerlink" href="#using-a-denormalized-model-to-store-then-retrieve-data" title="Permalink to this headline">¶</a></h3>
+<p>In the Usergrid, a more efficient way to get the same result would start
+by including related user and product data with the review data. This
+would give you a single place to get all the data you&#8217;ll show.</p>
+<p>The following shows how that model might look as entities in the
+Usergrid. (The users and products entities are included here to remind
+you that they exist, but they aren’t actually used in this
+denormalization example.)</p>
+<img alt="../_images/reviews2.png" src="../_images/reviews2.png" />
+<p>This use case assumes that your user and product data are already in the
+data store. In the following API request code, you’re just adding a new
+review written by a user about a particular product. The JSON body is
+your new review entity (the JSON here is non-entitized to make it
+readable).</p>
+<div class="highlight-python"><div class="highlight"><pre>POST https://api.usergrid.com/my_org/my_app/reviews -d {
+    &quot;title&quot; : &quot;Tempted to climb in myself.&quot;,
+    &quot;body&quot; : &quot;I mean, who doesn&#39;t love a bouncy castle? The kids love it!&quot;,
+    &quot;rating&quot; : 3,
+    &quot;authorName&quot; : &quot;Jennie&quot;,
+    &quot;authorUUID&quot; : &lt;author_uuid&gt;,
+    &quot;authorImage&quot; : &quot;http://&lt;path_to_image&gt;.png&quot;,
+    &quot;productUUID&quot; : &lt;product_uuid&gt;,
+    &quot;productImage&quot; : &quot;http://&lt;path_to_image&gt;.jpg&quot;,
+    &quot;productName&quot; : &quot;Magic Castle Bounce House Inflatable Bouncer&quot;
+}
+</pre></div>
+</div>
+<p>Notice that you’re adding user and product data (which your client code
+would have at hand when the user posts the review) when you’re adding
+the review-specific data.</p>
+<p>Retrieving all the data from one place You’d get the review, including
+the subset of product and user data you need right away, by making one
+API call such as the following (note there’s no SQL-like query string
+needed):</p>
+<div class="highlight-python"><div class="highlight"><pre>GET http://api.usergrid.com/my_org/my_app/reviews/&lt;review_uuid&gt;
+</pre></div>
+</div>
+<p>Your result might look like this. The highlighted lines show data you&#8217;d
+present to the user.</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+    <span class="s">&quot;action&quot;</span> <span class="p">:</span> <span class="s">&quot;get&quot;</span><span class="p">,</span>
+    <span class="s">&quot;application&quot;</span> <span class="p">:</span> <span class="s">&quot;&lt;app_uuid&gt;&quot;</span><span class="p">,</span>
+    <span class="s">&quot;params&quot;</span> <span class="p">:</span> <span class="p">{</span> <span class="p">},</span>
+    <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span class="s">&quot;/reviews&quot;</span><span class="p">,</span>
+    <span class="s">&quot;uri&quot;</span> <span class="p">:</span> <span class="s">&quot;https://api.usergrid.com/my_org/my_app/reviews&quot;</span><span class="p">,</span>
+    <span class="s">&quot;entities&quot;</span> <span class="p">:</span> <span class="p">[</span> <span class="p">{</span>
+        <span class="s">&quot;uuid&quot;</span> <span class="p">:</span> <span class="s">&quot;&lt;review_uuid&gt;&quot;</span><span class="p">,</span>
+        <span class="s">&quot;type&quot;</span> <span class="p">:</span> <span class="s">&quot;review&quot;</span><span class="p">,</span>
+        <span class="s">&quot;created&quot;</span> <span class="p">:</span> <span class="mi">1395410364673</span><span class="p">,</span>
+        <span class="s">&quot;modified&quot;</span> <span class="p">:</span> <span class="mi">1395410364673</span><span class="p">,</span>
+        <span class="s">&quot;authorName&quot;</span> <span class="p">:</span> <span class="s">&quot;Jennie&quot;</span><span class="p">,</span>
+        <span class="s">&quot;authorImage&quot;</span> <span class="p">:</span> <span class="s">&quot;&lt;path_to_image&gt;.png&quot;</span><span class="p">,</span>
+        <span class="s">&quot;authorUUID&quot;</span> <span class="p">:</span> <span class="s">&quot;&lt;author_uuid&gt;&quot;</span><span class="p">,</span>
+        <span class="s">&quot;body&quot;</span> <span class="p">:</span> <span class="s">&quot;I mean, who doesn&#39;t love a bouncy castle? The kids love it!&quot;</span><span class="p">,</span>
+        <span class="s">&quot;metadata&quot;</span> <span class="p">:</span> <span class="p">{</span>
+            <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span class="s">&quot;/reviews/&lt;review_uuid&gt;&quot;</span>
+        <span class="p">},</span>
+        <span class="s">&quot;productImage&quot;</span> <span class="p">:</span> <span class="s">&quot;http://&lt;path_to_image&gt;.jpg&quot;</span><span class="p">,</span>
+        <span class="s">&quot;productName&quot;</span> <span class="p">:</span> <span class="s">&quot;Magic Castle Bounce House Inflatable Bouncer&quot;</span><span class="p">,</span>
+        <span class="s">&quot;productUUID&quot;</span> <span class="p">:</span> <span class="s">&quot;&lt;product_uuid&gt;&quot;</span><span class="p">,</span>
+        <span class="s">&quot;rating&quot;</span> <span class="p">:</span> <span class="mi">3</span><span class="p">,</span>
+        <span class="s">&quot;title&quot;</span> <span class="p">:</span> <span class="s">&quot;Tempted to climb in myself.&quot;</span>
+    <span class="p">}</span> <span class="p">],</span>
+    <span class="s">&quot;timestamp&quot;</span> <span class="p">:</span> <span class="mi">1395764951934</span><span class="p">,</span>
+    <span class="s">&quot;duration&quot;</span> <span class="p">:</span> <span class="mi">16</span><span class="p">,</span>
+    <span class="s">&quot;organization&quot;</span> <span class="p">:</span> <span class="s">&quot;my_org&quot;</span><span class="p">,</span>
+    <span class="s">&quot;applicationName&quot;</span> <span class="p">:</span> <span class="s">&quot;my_app&quot;</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+<p>This gives you, in one request, all the review information you’d planned
+on presenting to your app’s users for a single view. Your client code
+could retrieve the review entity in the result, along with the product
+and user data, then present it all as a review.</p>
+<p>Best practice: Connect entities to simplify scoped requests Another way
+to streamline your requests is to connect entities by using the built-in
+connections feature. In a sense, a connection can replace the WHERE
+clause of a query you might have written.</p>
+<p>Getting back to the review example, imagine you want to retrieve all of
+the reviews written by a particular user. In the relational example, you
+might have an SQL query such as this:</p>
+<div class="highlight-python"><div class="highlight"><pre>SELECT * FROM reviews WHERE authorId = &lt;user_uuid&gt;;
+</pre></div>
+</div>
+<p>Even in the Usergrid, you could use a similar syntax in a query string
+appended to an API path. Working from the review entity model in the
+preceding example, that might look like this (though yours would likely
+entitize the spaces):</p>
+<div class="highlight-python"><div class="highlight"><pre>GET http://api.usergrid.com/my_org/my_app/reviews?ql=select * where
+        authorUUID=&lt;user_uuid&gt;
+</pre></div>
+</div>
+<p>But if this is an API call you’re going to be making often, there’s a
+better way. Instead, create a connection between the review and the user
+when your code creates the review. You can connect entities with a verb
+that describes their relationship to one another.</p>
+<p>The following creates Jennie’s review and at the same time connects her
+as the person who “wrote” it. (For easier reading, this example contains
+spaces you wouldn’t be able to include.)</p>
+<div class="highlight-python"><div class="highlight"><pre>POST http://api.usergrid.com/my_org/my_app/users/jennie/wrote/reviews {
+    &quot;title&quot; : &quot;Tempted to climb in myself.&quot;,
+    &quot;body&quot; : &quot;I mean, who doesn&#39;t love a bouncy castle? The kids love it!&quot;,
+    &quot;rating&quot; : 3,
+    &quot;authorName&quot; : &quot;Jennie&quot;,
+    &quot;authorImage&quot; : &quot;http://&lt;path_to_image&gt;.png&quot;,
+    &quot;productName&quot; : &quot;Magic Castle Bounce House Inflatable Bouncer&quot;,
+    &quot;productImage&quot; : &quot;http://&lt;path_to_image&gt;.jpg&quot;
+}
+</pre></div>
+</div>
+<p>When reading the data, you’d retrieve all of the reviews Jennie has
+written with a URL that’s nearly identical, minus the JSON:</p>
+<div class="highlight-python"><div class="highlight"><pre>GET http://api.usergrid.com/my_org/my_app/users/jennie/wrote/reviews
+</pre></div>
+</div>
+<p>Your request result would look something like the following. Here, the
+entities array returned contains the reviews you connected with Jennie
+(though there’s only one in this example). The connection-specific
+metadata is highlighted.</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+    <span class="s">&quot;action&quot;</span> <span class="p">:</span> <span class="s">&quot;get&quot;</span><span class="p">,</span>
+    <span class="s">&quot;application&quot;</span> <span class="p">:</span> <span class="s">&quot;&lt;app_uuid&gt;&quot;</span><span class="p">,</span>
+    <span class="s">&quot;params&quot;</span> <span class="p">:</span> <span class="p">{</span> <span class="p">},</span>
+    <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/&lt;user_uuid&gt;/wrote&quot;</span><span class="p">,</span>
+    <span class="s">&quot;uri&quot;</span> <span class="p">:</span> <span class="s">&quot;https://api.usergrid.com/my_org/my_app/users/&lt;user_uuid&gt;/wrote&quot;</span><span class="p">,</span>
+    <span class="s">&quot;entities&quot;</span> <span class="p">:</span> <span class="p">[</span> <span class="p">{</span>
+        <span class="s">&quot;uuid&quot;</span> <span class="p">:</span> <span class="s">&quot;&lt;review_uuid&gt;&quot;</span><span class="p">,</span>
+        <span class="s">&quot;type&quot;</span> <span class="p">:</span> <span class="s">&quot;review&quot;</span><span class="p">,</span>
+        <span class="s">&quot;created&quot;</span> <span class="p">:</span> <span class="mi">1395410364673</span><span class="p">,</span>
+        <span class="s">&quot;modified&quot;</span> <span class="p">:</span> <span class="mi">1395410364673</span><span class="p">,</span>
+        <span class="s">&quot;authorName&quot;</span> <span class="p">:</span> <span class="s">&quot;Jennie&quot;</span><span class="p">,</span>
+        <span class="s">&quot;authorImage&quot;</span> <span class="p">:</span> <span class="s">&quot;http://&lt;path_to_image&gt;.png&quot;</span><span class="p">,</span>
+        <span class="s">&quot;authorUUID&quot;</span> <span class="p">:</span> <span class="s">&quot;&lt;user_uuid&gt;&quot;</span><span class="p">,</span>
+        <span class="s">&quot;body&quot;</span> <span class="p">:</span> <span class="s">&quot;I mean, who doesn&#39;t love a bouncy castle? Kids love it!&quot;</span><span class="p">,</span>
+        <span class="s">&quot;metadata&quot;</span> <span class="p">:</span> <span class="p">{</span>
+            <span class="s">&quot;connecting&quot;</span> <span class="p">:</span> <span class="p">{</span>
+                <span class="s">&quot;wrote&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/&lt;user_uuid&gt;/wrote/&lt;review_uuid&gt;/connecting/wrote&quot;</span>
+            <span class="p">},</span>
+            <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/&lt;user_uuid&gt;/wrote/&lt;review_uuid&gt;&quot;</span><span class="p">,</span>
+        <span class="p">},</span>
+        <span class="s">&quot;productImage&quot;</span> <span class="p">:</span> <span class="s">&quot;http://&lt;path_to_image&gt;.jpg&quot;</span><span class="p">,</span>
+        <span class="s">&quot;productName&quot;</span> <span class="p">:</span> <span class="s">&quot;Magic Castle Bounce House Inflatable Bouncer&quot;</span><span class="p">,</span>
+        <span class="s">&quot;productUUID&quot;</span> <span class="p">:</span> <span class="s">&quot;&lt;product_uuid&gt;&quot;</span><span class="p">,</span>
+        <span class="s">&quot;rating&quot;</span> <span class="p">:</span> <span class="mi">3</span><span class="p">,</span>
+        <span class="s">&quot;title&quot;</span> <span class="p">:</span> <span class="s">&quot;Tempted to climb in myself.&quot;</span>
+    <span class="p">}</span> <span class="p">],</span>
+    <span class="s">&quot;timestamp&quot;</span> <span class="p">:</span> <span class="mi">1395777037697</span><span class="p">,</span>
+    <span class="s">&quot;duration&quot;</span> <span class="p">:</span> <span class="mi">19</span><span class="p">,</span>
+    <span class="s">&quot;organization&quot;</span> <span class="p">:</span> <span class="s">&quot;my_org&quot;</span><span class="p">,</span>
+    <span class="s">&quot;applicationName&quot;</span> <span class="p">:</span> <span class="s">&quot;my_app&quot;</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+<p>To retrieve a particular review written by Jennie, you could use
+something like the following:</p>
+<div class="highlight-python"><div class="highlight"><pre>GET http://api.usergrid.com/my_org/my_app/users/jennie/wrote/reviews/&lt;review_uuid&gt;
+</pre></div>
+</div>
+<p>You can create connections to set up relationships you can use to later
+retrieve data quickly and with a simple syntax.</p>
+<p>For example, when creating a connected entity (such as the review entity
+here), you can at the same time create other connections to connect the
+product to the new review, then connect the product to its reviewer
+(paths are abbreviated in these examples):</p>
+<div class="highlight-python"><div class="highlight"><pre>POST /users/jennie/wrote/reviews {&lt;review_entity_json&gt;}
+POST /products/&lt;reviewed_product_uuid&gt;/reviewedIn/reviews/&lt;new_review_uuid&gt;
+POST /products/&lt;reviewed_product_uuid&gt;/reviewedBy/users/jennie
+</pre></div>
+</div>
+<p>Having created these connections for each review you post, in addition
+to getting the review the user wrote, you could later also:</p>
+<p>Get the reviews for a product:</p>
+<div class="highlight-python"><div class="highlight"><pre>GET /products/&lt;reviewed_product_uuid&gt;/reviewedIn/reviews
+Get the users who reviewed the product:
+GET /products/&lt;reviewed_product_uuid&gt;/reviewedBy/users
+</pre></div>
+</div>
+</div>
+</div>
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+      
+        <a href="collections.html" class="btn btn-neutral float-right" title="Collections" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+      
+      
+        <a href="data-store-dbms.html" class="btn btn-neutral" title="The Usergrid Data Store" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+      
+    </div>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/entity-connections/connecting-entities.html
----------------------------------------------------------------------
diff --git a/content/docs/entity-connections/connecting-entities.html b/content/docs/entity-connections/connecting-entities.html
new file mode 100644
index 0000000..d1bcda8
--- /dev/null
+++ b/content/docs/entity-connections/connecting-entities.html
@@ -0,0 +1,378 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>Connecting entities &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+        <link rel="next" title="Retrieving connections" href="retrieving-entities.html"/>
+        <link rel="prev" title="Advanced query usage" href="../data-queries/advanced-query-usage.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul class="current">
+<li class="toctree-l1 current"><a class="current reference internal" href="">Connecting entities</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#request-syntax">Request syntax</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>Connecting entities</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/entity-connections/connecting-entities.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="connecting-entities">
+<h1>Connecting entities<a class="headerlink" href="#connecting-entities" title="Permalink to this headline">¶</a></h1>
+<p>When creating a connection, if you specify the collection of the entity
+being connected to, you can create the connection using the value of its
+&#8216;name&#8217; property or its UUID.</p>
+<div class="section" id="request-syntax">
+<h2>Request syntax<a class="headerlink" href="#request-syntax" title="Permalink to this headline">¶</a></h2>
+<p>To create a connection, the entity being connected to can either be
+specified by just its UUID, or both its collection and the value of its
+&#8216;name&#8217; property.</p>
+<p>Connect by UUID</p>
+<div class="highlight-python"><div class="highlight"><pre>curl -X POST https://api.usergrid.com/&lt;org&gt;/&lt;app&gt;/&lt;connecting_collection&gt;/&lt;connecting_entity&gt;/&lt;relationship&gt;/&lt;connected_entity&gt;
+</pre></div>
+</div>
+<p>Connect by &#8216;name&#8217; property</p>
+<div class="highlight-python"><div class="highlight"><pre>curl -X POST https://api.usergrid.com/&lt;org&gt;/&lt;app&gt;/&lt;connecting_collection&gt;/&lt;connecting_entity&gt;/&lt;relationship&gt;/&lt;connected_collection&gt;/&lt;connected_entity&gt;
+</pre></div>
+</div>
+<p>Parameters</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="28%" />
+<col width="72%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>org</td>
+<td>Organization UUID or organization name</td>
+</tr>
+<tr class="row-odd"><td>app</td>
+<td>Application UUID or application name</td>
+</tr>
+<tr class="row-even"><td>connecting_collection</td>
+<td>Name or UUID of the collection of the connecting entity.</td>
+</tr>
+<tr class="row-odd"><td>connecting_entity</td>
+<td>Name or UUID of the connecting entity.</td>
+</tr>
+<tr class="row-even"><td>relationship</td>
+<td>Type of connection being created (e.g., likes)</td>
+</tr>
+<tr class="row-odd"><td>connected_collection</td>
+<td>Name or UUID of the collection of the entity being connected to.</td>
+</tr>
+<tr class="row-even"><td>connected_entity</td>
+<td>Name or UUID of the entity being connected to.</td>
+</tr>
+</tbody>
+</table>
+<p>If the connecting entity is a &#8216;user&#8217; entity, the &#8216;username&#8217; should be
+used rather than the &#8216;name&#8217;.</p>
+<p>&#8216;connected_collection&#8217; is not required if the entity being connected to
+is specified by its UUID.</p>
+<p>Example request</p>
+<div class="highlight-python"><div class="highlight"><pre>curl -X POST http://api.usergrid.com/your-org/your-app/users/Arthur/likes/6c56ffda-9e75-11e3-99fd-8dd1801e534c
+</pre></div>
+</div>
+<p>Example Response</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+    <span class="s">&quot;action&quot;</span> <span class="p">:</span> <span class="s">&quot;post&quot;</span><span class="p">,</span>
+    <span class="s">&quot;application&quot;</span> <span class="p">:</span> <span class="s">&quot;db1e60a0-417f-11e3-9586-0f1ff3650d20&quot;</span><span class="p">,</span>
+    <span class="s">&quot;params&quot;</span> <span class="p">:</span> <span class="p">{</span> <span class="p">},</span>
+    <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/174785aa-8ea8-11e3-ae1f-eb20e5bce407/likes&quot;</span><span class="p">,</span>
+    <span class="s">&quot;uri&quot;</span> <span class="p">:</span> <span class="s">&quot;https://api.usergrid.com/my-org/my-app/users/174785aa-8ea8-11e3-ae1f-eb20e5bce407/likes&quot;</span><span class="p">,</span>
+    <span class="s">&quot;entities&quot;</span> <span class="p">:</span> <span class="p">[</span> <span class="p">{</span>
+        <span class="s">&quot;uuid&quot;</span> <span class="p">:</span> <span class="s">&quot;6c56ffda-9e75-11e3-99fd-8dd1801e534c&quot;</span><span class="p">,</span>
+        <span class="s">&quot;type&quot;</span> <span class="p">:</span> <span class="s">&quot;user&quot;</span><span class="p">,</span>
+        <span class="s">&quot;name&quot;</span> <span class="p">:</span> <span class="s">&quot;Arthur&quot;</span><span class="p">,</span>
+        <span class="s">&quot;created&quot;</span> <span class="p">:</span> <span class="mi">1393371291725</span><span class="p">,</span>
+        <span class="s">&quot;modified&quot;</span> <span class="p">:</span> <span class="mi">1393371291725</span><span class="p">,</span>
+        <span class="s">&quot;metadata&quot;</span> <span class="p">:</span> <span class="p">{</span>
+            <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/174785aa-8ea8-11e3-ae1f-eb20e5bce407/likes/6c56ffda-9e75-11e3-99fd-8dd1801e534c&quot;</span>
+        <span class="p">}</span>
+    <span class="p">}</span> <span class="p">],</span>
+    <span class="s">&quot;timestamp&quot;</span> <span class="p">:</span> <span class="mi">1393371455487</span><span class="p">,</span>
+    <span class="s">&quot;duration&quot;</span> <span class="p">:</span> <span class="mi">77</span><span class="p">,</span>
+    <span class="s">&quot;organization&quot;</span> <span class="p">:</span> <span class="s">&quot;your-org&quot;</span><span class="p">,</span>
+    <span class="s">&quot;applicationName&quot;</span> <span class="p">:</span> <span class="s">&quot;your-app&quot;</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+      
+        <a href="retrieving-entities.html" class="btn btn-neutral float-right" title="Retrieving connections" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+      
+      
+        <a href="../data-queries/advanced-query-usage.html" class="btn btn-neutral" title="Advanced query usage" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+      
+    </div>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/entity-connections/disconnecting-entities.html
----------------------------------------------------------------------
diff --git a/content/docs/entity-connections/disconnecting-entities.html b/content/docs/entity-connections/disconnecting-entities.html
new file mode 100644
index 0000000..cae444b
--- /dev/null
+++ b/content/docs/entity-connections/disconnecting-entities.html
@@ -0,0 +1,395 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>Disconnecting entities &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+        <link rel="next" title="Security &amp; token authentication" href="../security-and-auth/app-security.html"/>
+        <link rel="prev" title="Retrieving connections" href="retrieving-entities.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">Disconnecting entities</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#request-syntax">Request syntax</a></li>
+</ul>
+</li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>Disconnecting entities</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/entity-connections/disconnecting-entities.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="disconnecting-entities">
+<h1>Disconnecting entities<a class="headerlink" href="#disconnecting-entities" title="Permalink to this headline">¶</a></h1>
+<p>To disconnect a user from other data, perform a DELETE operation against
+the same endpoint at which you posted to create the connection.</p>
+<div class="section" id="request-syntax">
+<h2>Request syntax<a class="headerlink" href="#request-syntax" title="Permalink to this headline">¶</a></h2>
+<p>Disconnect by UUID</p>
+<div class="highlight-python"><div class="highlight"><pre>curl -X DELETE https://api.usergrid.com/&lt;org&gt;/&lt;app&gt;/&lt;connecting_collection&gt;/&lt;connecting_entity&gt;/&lt;relationship&gt;/&lt;connected_entity&gt;
+</pre></div>
+</div>
+<p>Disconnect by &#8216;name&#8217; property</p>
+<div class="highlight-python"><div class="highlight"><pre>curl -X DELETE https://api.usergrid.com/&lt;org&gt;/&lt;app&gt;/&lt;connecting_collection&gt;/&lt;connecting_entity&gt;/&lt;relationship&gt;/&lt;connected_collection&gt;/&lt;connected_entity&gt;
+</pre></div>
+</div>
+<p>Parameters</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="28%" />
+<col width="72%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>org</td>
+<td>Organization UUID or organization name</td>
+</tr>
+<tr class="row-odd"><td>app</td>
+<td>Application UUID or application name</td>
+</tr>
+<tr class="row-even"><td>connecting_collection</td>
+<td>Name or UUID of the collection of the connecting entity.</td>
+</tr>
+<tr class="row-odd"><td>connecting_entity</td>
+<td>Name or UUID of the connecting entity.</td>
+</tr>
+<tr class="row-even"><td>relationship</td>
+<td>Type of connection being created (e.g., likes)</td>
+</tr>
+<tr class="row-odd"><td>connected_collection</td>
+<td>Name or UUID of the collection of the entity being connected to.</td>
+</tr>
+<tr class="row-even"><td>connected_entity</td>
+<td>Name or UUID of the entity being connected to.</td>
+</tr>
+</tbody>
+</table>
+<p>If the connecting entity is a &#8216;user&#8217; entity, the &#8216;username&#8217; should be
+used rather than the &#8216;name&#8217;.</p>
+<p>&#8216;connected_collection&#8217; is not required if the entity being connected to
+is specified by its UUID.Parameter</p>
+<p>Example request</p>
+<div class="highlight-python"><div class="highlight"><pre>curl -X DELETE https://api.usergrid.com/your-org/your-app/users/Arthur/likes/users/Ford
+</pre></div>
+</div>
+<p>Example response</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+  <span class="s">&quot;action&quot;</span> <span class="p">:</span> <span class="s">&quot;delete&quot;</span><span class="p">,</span>
+  <span class="s">&quot;application&quot;</span> <span class="p">:</span> <span class="s">&quot;k88dh4f-a166-11e2-a7f7-02e81adcf3d0&quot;</span><span class="p">,</span>
+  <span class="s">&quot;params&quot;</span> <span class="p">:</span> <span class="p">{</span> <span class="p">},</span>
+  <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/58606d0a-cfed-11e3-a694-dbf5228024a7/likes&quot;</span><span class="p">,</span>
+  <span class="s">&quot;uri&quot;</span> <span class="p">:</span> <span class="s">&quot;https://api.usergrid.com/your-org/your-app/users/58606d0a-cfed-11e3-a694-dbf5228024a7/likes&quot;</span><span class="p">,</span>
+  <span class="s">&quot;entities&quot;</span> <span class="p">:</span> <span class="p">[</span> <span class="p">{</span>
+    <span class="s">&quot;uuid&quot;</span> <span class="p">:</span> <span class="s">&quot;5bcc47ca-cfed-11e3-8bde-a7e008061e10&quot;</span><span class="p">,</span>
+    <span class="s">&quot;type&quot;</span> <span class="p">:</span> <span class="s">&quot;user&quot;</span><span class="p">,</span>
+    <span class="s">&quot;created&quot;</span> <span class="p">:</span> <span class="mi">1398810410556</span><span class="p">,</span>
+    <span class="s">&quot;modified&quot;</span> <span class="p">:</span> <span class="mi">1398810410556</span><span class="p">,</span>
+    <span class="s">&quot;username&quot;</span> <span class="p">:</span> <span class="s">&quot;Ford&quot;</span><span class="p">,</span>
+    <span class="s">&quot;activated&quot;</span> <span class="p">:</span> <span class="n">true</span><span class="p">,</span>
+    <span class="s">&quot;metadata&quot;</span> <span class="p">:</span> <span class="p">{</span>
+      <span class="s">&quot;connecting&quot;</span> <span class="p">:</span> <span class="p">{</span>
+        <span class="s">&quot;likes&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/58606d0a-cfed-11e3-a694-dbf5228024a7/likes/5bcc47ca-cfed-11e3-8bde-a7e008061e10/connecting/likes&quot;</span>
+      <span class="p">},</span>
+      <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/58606d0a-cfed-11e3-a694-dbf5228024a7/likes/5bcc47ca-cfed-11e3-8bde-a7e008061e10&quot;</span><span class="p">,</span>
+      <span class="s">&quot;sets&quot;</span> <span class="p">:</span> <span class="p">{</span>
+        <span class="s">&quot;rolenames&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/58606d0a-cfed-11e3-a694-dbf5228024a7/likes/5bcc47ca-cfed-11e3-8bde-a7e008061e10/roles&quot;</span><span class="p">,</span>
+        <span class="s">&quot;permissions&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/58606d0a-cfed-11e3-a694-dbf5228024a7/likes/5bcc47ca-cfed-11e3-8bde-a7e008061e10/permissions&quot;</span>
+      <span class="p">},</span>
+      <span class="s">&quot;connections&quot;</span> <span class="p">:</span> <span class="p">{</span>
+        <span class="s">&quot;friends&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/58606d0a-cfed-11e3-a694-dbf5228024a7/likes/5bcc47ca-cfed-11e3-8bde-a7e008061e10/friends&quot;</span><span class="p">,</span>
+        <span class="s">&quot;likes&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/58606d0a-cfed-11e3-a694-dbf5228024a7/likes/5bcc47ca-cfed-11e3-8bde-a7e008061e10/likes&quot;</span>
+      <span class="p">},</span>
+      <span class="s">&quot;collections&quot;</span> <span class="p">:</span> <span class="p">{</span>
+        <span class="s">&quot;activities&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/58606d0a-cfed-11e3-a694-dbf5228024a7/likes/5bcc47ca-cfed-11e3-8bde-a7e008061e10/activities&quot;</span><span class="p">,</span>
+        <span class="s">&quot;devices&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/58606d0a-cfed-11e3-a694-dbf5228024a7/likes/5bcc47ca-cfed-11e3-8bde-a7e008061e10/devices&quot;</span><span class="p">,</span>
+        <span class="s">&quot;feed&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/58606d0a-cfed-11e3-a694-dbf5228024a7/likes/5bcc47ca-cfed-11e3-8bde-a7e008061e10/feed&quot;</span><span class="p">,</span>
+        <span class="s">&quot;groups&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/58606d0a-cfed-11e3-a694-dbf5228024a7/likes/5bcc47ca-cfed-11e3-8bde-a7e008061e10/groups&quot;</span><span class="p">,</span>
+        <span class="s">&quot;roles&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/58606d0a-cfed-11e3-a694-dbf5228024a7/likes/5bcc47ca-cfed-11e3-8bde-a7e008061e10/roles&quot;</span><span class="p">,</span>
+        <span class="s">&quot;following&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/58606d0a-cfed-11e3-a694-dbf5228024a7/likes/5bcc47ca-cfed-11e3-8bde-a7e008061e10/following&quot;</span><span class="p">,</span>
+        <span class="s">&quot;followers&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/58606d0a-cfed-11e3-a694-dbf5228024a7/likes/5bcc47ca-cfed-11e3-8bde-a7e008061e10/followers&quot;</span>
+      <span class="p">}</span>
+    <span class="p">}</span>
+  <span class="p">}</span> <span class="p">],</span>
+  <span class="s">&quot;timestamp&quot;</span> <span class="p">:</span> <span class="mi">1398962837195</span><span class="p">,</span>
+  <span class="s">&quot;duration&quot;</span> <span class="p">:</span> <span class="mi">85</span><span class="p">,</span>
+  <span class="s">&quot;organization&quot;</span> <span class="p">:</span> <span class="s">&quot;your-org&quot;</span><span class="p">,</span>
+  <span class="s">&quot;applicationName&quot;</span> <span class="p">:</span> <span class="s">&quot;your-app&quot;</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+      
+        <a href="../security-and-auth/app-security.html" class="btn btn-neutral float-right" title="Security &amp; token authentication" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+      
+      
+        <a href="retrieving-entities.html" class="btn btn-neutral" title="Retrieving connections" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+      
+    </div>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

[55/60] [abbrv] incubator-usergrid git commit: Fixing link to docs.

[sn...@apache.org]

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/38afc44d/website/tmp/compiled_content
----------------------------------------------------------------------
diff --git a/website/tmp/compiled_content b/website/tmp/compiled_content
index ebac80e..bec3969 100644
--- a/website/tmp/compiled_content
+++ b/website/tmp/compiled_content
@@ -8,7 +8,7 @@
  * Designed and built with all the love in the world by @mdo and @fat.
  *//*! normalize.css v2.1.0 | MIT License | git.io/normalize */article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,video{display:inline-block}audio:not([controls]){display:none;height:0}[hidden]{display:none}html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}a:focus{outline:thin dotted}a:active,a:hover{outline:0}h1{margin:.67em 0;font-size:2em}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}dfn{font-style:italic}hr{height:0;-moz-box-sizing:content-box;box-sizing:content-box}mark{color:#000;background:#ff0}code,kbd,pre,samp{font-family:monospace,serif;font-size:1em}pre{white-space:pre-wrap}q{quotes:"\201C" "\201D" "\2018" "\2019"}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:0}fieldset{padding:.35em .625em .75em;margin:0 
 2px;border:1px solid #c0c0c0}legend{padding:0;border:0}button,input,select,textarea{margin:0;font-family:inherit;font-size:100%}button,input{line-height:normal}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button}button[disabled],html input[disabled]{cursor:default}input[type="checkbox"],input[type="radio"]{padding:0;box-sizing:border-box}input[type="search"]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}textarea{overflow:auto;vertical-align:top}table{border-collapse:collapse;border-spacing:0}@media print{*{color:#000!important;text-shadow:none!important;background:transparent!important;box-shadow:none!important}a,a:visited{text-decorati
 on:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}.ir a:after,a[href^="javascript:"]:after,a[href^="#"]:after{content:""}pre,blockquote{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}tr,img{page-break-inside:avoid}img{max-width:100%!important}@page{margin:2cm .5cm}p,h2,h3{orphans:3;widows:3}h2,h3{page-break-after:avoid}.navbar{display:none}.table td,.table th{background-color:#fff!important}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000!important}.label{border:1px solid #000}.table{border-collapse:collapse!important}.table-bordered th,.table-bordered td{border:1px solid #ddd!important}}*,*:before,*:after{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:62.5%;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.428571429;color:#333;background-color:#fff}input,button,select
 ,textarea{font-family:inherit;font-size:inherit;line-height:inherit}button,input,select[multiple],textarea{background-image:none}a{color:#428bca;text-decoration:none}a:hover,a:focus{color:#2a6496;text-decoration:underline}a:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}img{vertical-align:middle}.img-responsive{display:block;height:auto;max-width:100%}.img-rounded{border-radius:6px}.img-thumbnail{display:inline-block;height:auto;max-width:100%;padding:4px;line-height:1.428571429;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.img-circle{border-radius:50%}hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #eee}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0 0 0 0);border:0}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:16.099999999999998px;font-weight:200;line-height:1.4}@media(min-w
 idth:768px){.lead{font-size:21px}}small{font-size:85%}cite{font-style:normal}.text-muted{color:#999}.text-primary{color:#428bca}.text-warning{color:#c09853}.text-danger{color:#b94a48}.text-success{color:#468847}.text-info{color:#3a87ad}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}h1,h2,h3,h4,h5,h6,.h1,.h2,.h3,.h4,.h5,.h6{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-weight:500;line-height:1.1}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small,.h1 small,.h2 small,.h3 small,.h4 small,.h5 small,.h6 small{font-weight:normal;line-height:1;color:#999}h1,h2,h3{margin-top:20px;margin-bottom:10px}h1 small,h2 small,h3 small{font-size:65%}h4,h5,h6{margin-top:10px;margin-bottom:10px}h4 small,h5 small,h6 small{font-size:75%}h1,.h1{font-size:36px}h2,.h2{font-size:30px}h3,.h3{font-size:24px}h4,.h4{font-size:18px}h5,.h5{font-size:14px}h6,.h6{font-size:12px}.page-header{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #eee}ul,o
 l{margin-top:0;margin-bottom:10px}ul ul,ol ul,ul ol,ol ol{margin-bottom:0}.list-unstyled{padding-left:0;list-style:none}.list-inline{padding-left:0;list-style:none}.list-inline>li{display:inline-block;padding-right:5px;padding-left:5px}dl{margin-bottom:20px}dt,dd{line-height:1.428571429}dt{font-weight:bold}dd{margin-left:0}@media(min-width:768px){.dl-horizontal dt{float:left;width:160px;overflow:hidden;clear:left;text-align:right;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}.dl-horizontal dd:before,.dl-horizontal dd:after{display:table;content:" "}.dl-horizontal dd:after{clear:both}.dl-horizontal dd:before,.dl-horizontal dd:after{display:table;content:" "}.dl-horizontal dd:after{clear:both}}abbr[title],abbr[data-original-title]{cursor:help;border-bottom:1px dotted #999}abbr.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:10px 20px;margin:0 0 20px;border-left:5px solid #eee}blockquote p{font-size:17.5px;font-weight:300;line-height
 :1.25}blockquote p:last-child{margin-bottom:0}blockquote small{display:block;line-height:1.428571429;color:#999}blockquote small:before{content:'\2014 \00A0'}blockquote.pull-right{padding-right:15px;padding-left:0;border-right:5px solid #eee;border-left:0}blockquote.pull-right p,blockquote.pull-right small{text-align:right}blockquote.pull-right small:before{content:''}blockquote.pull-right small:after{content:'\00A0 \2014'}q:before,q:after,blockquote:before,blockquote:after{content:""}address{display:block;margin-bottom:20px;font-style:normal;line-height:1.428571429}code,pre{font-family:Monaco,Menlo,Consolas,"Courier New",monospace}code{padding:2px 4px;font-size:90%;color:#c7254e;white-space:nowrap;background-color:#f9f2f4;border-radius:4px}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.428571429;color:#333;word-break:break-all;word-wrap:break-word;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}pre.prettyprint{margin-bottom:20px}pre co
 de{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border:0}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}.container:before,.container:after{display:table;content:" "}.container:after{clear:both}.container:before,.container:after{display:table;content:" "}.container:after{clear:both}.row{margin-right:-15px;margin-left:-15px}.row:before,.row:after{display:table;content:" "}.row:after{clear:both}.row:before,.row:after{display:table;content:" "}.row:after{clear:both}.col-xs-1,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9,.col-xs-10,.col-xs-11,.col-xs-12,.col-sm-1,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-sm-10,.col-sm-11,.col-sm-12,.col-md-1,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-md-10,.col-md-11,.col-md-12,.col-lg-1,.col-lg-2,.col-lg-
 3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-lg-10,.col-lg-11,.col-lg-12{position:relative;min-height:1px;padding-right:15px;padding-left:15px}.col-xs-1,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9,.col-xs-10,.col-xs-11{float:left}.col-xs-1{width:8.333333333333332%}.col-xs-2{width:16.666666666666664%}.col-xs-3{width:25%}.col-xs-4{width:33.33333333333333%}.col-xs-5{width:41.66666666666667%}.col-xs-6{width:50%}.col-xs-7{width:58.333333333333336%}.col-xs-8{width:66.66666666666666%}.col-xs-9{width:75%}.col-xs-10{width:83.33333333333334%}.col-xs-11{width:91.66666666666666%}.col-xs-12{width:100%}@media(min-width:768px){.container{max-width:750px}.col-sm-1,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-sm-10,.col-sm-11{float:left}.col-sm-1{width:8.333333333333332%}.col-sm-2{width:16.666666666666664%}.col-sm-3{width:25%}.col-sm-4{width:33.33333333333333%}.col-sm-5{width:41.66666666666667%}.col-sm-
 6{width:50%}.col-sm-7{width:58.333333333333336%}.col-sm-8{width:66.66666666666666%}.col-sm-9{width:75%}.col-sm-10{width:83.33333333333334%}.col-sm-11{width:91.66666666666666%}.col-sm-12{width:100%}.col-sm-push-1{left:8.333333333333332%}.col-sm-push-2{left:16.666666666666664%}.col-sm-push-3{left:25%}.col-sm-push-4{left:33.33333333333333%}.col-sm-push-5{left:41.66666666666667%}.col-sm-push-6{left:50%}.col-sm-push-7{left:58.333333333333336%}.col-sm-push-8{left:66.66666666666666%}.col-sm-push-9{left:75%}.col-sm-push-10{left:83.33333333333334%}.col-sm-push-11{left:91.66666666666666%}.col-sm-pull-1{right:8.333333333333332%}.col-sm-pull-2{right:16.666666666666664%}.col-sm-pull-3{right:25%}.col-sm-pull-4{right:33.33333333333333%}.col-sm-pull-5{right:41.66666666666667%}.col-sm-pull-6{right:50%}.col-sm-pull-7{right:58.333333333333336%}.col-sm-pull-8{right:66.66666666666666%}.col-sm-pull-9{right:75%}.col-sm-pull-10{right:83.33333333333334%}.col-sm-pull-11{right:91.66666666666666%}.col-sm-offse
 t-1{margin-left:8.333333333333332%}.col-sm-offset-2{margin-left:16.666666666666664%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-4{margin-left:33.33333333333333%}.col-sm-offset-5{margin-left:41.66666666666667%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-7{margin-left:58.333333333333336%}.col-sm-offset-8{margin-left:66.66666666666666%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-10{margin-left:83.33333333333334%}.col-sm-offset-11{margin-left:91.66666666666666%}}@media(min-width:992px){.container{max-width:970px}.col-md-1,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-md-10,.col-md-11{float:left}.col-md-1{width:8.333333333333332%}.col-md-2{width:16.666666666666664%}.col-md-3{width:25%}.col-md-4{width:33.33333333333333%}.col-md-5{width:41.66666666666667%}.col-md-6{width:50%}.col-md-7{width:58.333333333333336%}.col-md-8{width:66.66666666666666%}.col-md-9{width:75%}.col-md-10{width:83.33333333333334%}.col-md-11{width:91.66666666666666%}.col
 -md-12{width:100%}.col-md-push-0{left:auto}.col-md-push-1{left:8.333333333333332%}.col-md-push-2{left:16.666666666666664%}.col-md-push-3{left:25%}.col-md-push-4{left:33.33333333333333%}.col-md-push-5{left:41.66666666666667%}.col-md-push-6{left:50%}.col-md-push-7{left:58.333333333333336%}.col-md-push-8{left:66.66666666666666%}.col-md-push-9{left:75%}.col-md-push-10{left:83.33333333333334%}.col-md-push-11{left:91.66666666666666%}.col-md-pull-0{right:auto}.col-md-pull-1{right:8.333333333333332%}.col-md-pull-2{right:16.666666666666664%}.col-md-pull-3{right:25%}.col-md-pull-4{right:33.33333333333333%}.col-md-pull-5{right:41.66666666666667%}.col-md-pull-6{right:50%}.col-md-pull-7{right:58.333333333333336%}.col-md-pull-8{right:66.66666666666666%}.col-md-pull-9{right:75%}.col-md-pull-10{right:83.33333333333334%}.col-md-pull-11{right:91.66666666666666%}.col-md-offset-0{margin-left:0}.col-md-offset-1{margin-left:8.333333333333332%}.col-md-offset-2{margin-left:16.666666666666664%}.col-md-offse
 t-3{margin-left:25%}.col-md-offset-4{margin-left:33.33333333333333%}.col-md-offset-5{margin-left:41.66666666666667%}.col-md-offset-6{margin-left:50%}.col-md-offset-7{margin-left:58.333333333333336%}.col-md-offset-8{margin-left:66.66666666666666%}.col-md-offset-9{margin-left:75%}.col-md-offset-10{margin-left:83.33333333333334%}.col-md-offset-11{margin-left:91.66666666666666%}}@media(min-width:1200px){.container{max-width:1170px}.col-lg-1,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-lg-10,.col-lg-11{float:left}.col-lg-1{width:8.333333333333332%}.col-lg-2{width:16.666666666666664%}.col-lg-3{width:25%}.col-lg-4{width:33.33333333333333%}.col-lg-5{width:41.66666666666667%}.col-lg-6{width:50%}.col-lg-7{width:58.333333333333336%}.col-lg-8{width:66.66666666666666%}.col-lg-9{width:75%}.col-lg-10{width:83.33333333333334%}.col-lg-11{width:91.66666666666666%}.col-lg-12{width:100%}.col-lg-push-0{left:auto}.col-lg-push-1{left:8.333333333333332%}.col-lg-push-
 2{left:16.666666666666664%}.col-lg-push-3{left:25%}.col-lg-push-4{left:33.33333333333333%}.col-lg-push-5{left:41.66666666666667%}.col-lg-push-6{left:50%}.col-lg-push-7{left:58.333333333333336%}.col-lg-push-8{left:66.66666666666666%}.col-lg-push-9{left:75%}.col-lg-push-10{left:83.33333333333334%}.col-lg-push-11{left:91.66666666666666%}.col-lg-pull-0{right:auto}.col-lg-pull-1{right:8.333333333333332%}.col-lg-pull-2{right:16.666666666666664%}.col-lg-pull-3{right:25%}.col-lg-pull-4{right:33.33333333333333%}.col-lg-pull-5{right:41.66666666666667%}.col-lg-pull-6{right:50%}.col-lg-pull-7{right:58.333333333333336%}.col-lg-pull-8{right:66.66666666666666%}.col-lg-pull-9{right:75%}.col-lg-pull-10{right:83.33333333333334%}.col-lg-pull-11{right:91.66666666666666%}.col-lg-offset-0{margin-left:0}.col-lg-offset-1{margin-left:8.333333333333332%}.col-lg-offset-2{margin-left:16.666666666666664%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-4{margin-left:33.33333333333333%}.col-lg-offset-5{margin-lef
 t:41.66666666666667%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-7{margin-left:58.333333333333336%}.col-lg-offset-8{margin-left:66.66666666666666%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-10{margin-left:83.33333333333334%}.col-lg-offset-11{margin-left:91.66666666666666%}}table{max-width:100%;background-color:transparent}th{text-align:left}.table{width:100%;margin-bottom:20px}.table thead>tr>th,.table tbody>tr>th,.table tfoot>tr>th,.table thead>tr>td,.table tbody>tr>td,.table tfoot>tr>td{padding:8px;line-height:1.428571429;vertical-align:top;border-top:1px solid #ddd}.table thead>tr>th{vertical-align:bottom;border-bottom:2px solid #ddd}.table caption+thead tr:first-child th,.table colgroup+thead tr:first-child th,.table thead:first-child tr:first-child th,.table caption+thead tr:first-child td,.table colgroup+thead tr:first-child td,.table thead:first-child tr:first-child td{border-top:0}.table tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.tabl
 e-condensed thead>tr>th,.table-condensed tbody>tr>th,.table-condensed tfoot>tr>th,.table-condensed thead>tr>td,.table-condensed tbody>tr>td,.table-condensed tfoot>tr>td{padding:5px}.table-bordered{border:1px solid #ddd}.table-bordered>thead>tr>th,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>tbody>tr>td,.table-bordered>tfoot>tr>td{border:1px solid #ddd}.table-bordered>thead>tr>th,.table-bordered>thead>tr>td{border-bottom-width:2px}.table-striped>tbody>tr:nth-child(odd)>td,.table-striped>tbody>tr:nth-child(odd)>th{background-color:#f9f9f9}.table-hover>tbody>tr:hover>td,.table-hover>tbody>tr:hover>th{background-color:#f5f5f5}table col[class*="col-"]{display:table-column;float:none}table td[class*="col-"],table th[class*="col-"]{display:table-cell;float:none}.table>thead>tr>td.active,.table>tbody>tr>td.active,.table>tfoot>tr>td.active,.table>thead>tr>th.active,.table>tbody>tr>th.active,.table>tfoot>tr>th.active,.table>thead>tr.activ
 e>td,.table>tbody>tr.active>td,.table>tfoot>tr.active>td,.table>thead>tr.active>th,.table>tbody>tr.active>th,.table>tfoot>tr.active>th{background-color:#f5f5f5}.table>thead>tr>td.success,.table>tbody>tr>td.success,.table>tfoot>tr>td.success,.table>thead>tr>th.success,.table>tbody>tr>th.success,.table>tfoot>tr>th.success,.table>thead>tr.success>td,.table>tbody>tr.success>td,.table>tfoot>tr.success>td,.table>thead>tr.success>th,.table>tbody>tr.success>th,.table>tfoot>tr.success>th{background-color:#dff0d8;border-color:#d6e9c6}.table-hover>tbody>tr>td.success:hover,.table-hover>tbody>tr>th.success:hover,.table-hover>tbody>tr.success:hover>td,.table-hover>tbody>tr.success:hover>th{background-color:#d0e9c6;border-color:#c9e2b3}.table>thead>tr>td.danger,.table>tbody>tr>td.danger,.table>tfoot>tr>td.danger,.table>thead>tr>th.danger,.table>tbody>tr>th.danger,.table>tfoot>tr>th.danger,.table>thead>tr.danger>td,.table>tbody>tr.danger>td,.table>tfoot>tr.danger>td,.table>thead>tr.danger>th,.tabl
 e>tbody>tr.danger>th,.table>tfoot>tr.danger>th{background-color:#f2dede;border-color:#eed3d7}.table-hover>tbody>tr>td.danger:hover,.table-hover>tbody>tr>th.danger:hover,.table-hover>tbody>tr.danger:hover>td,.table-hover>tbody>tr.danger:hover>th{background-color:#ebcccc;border-color:#e6c1c7}.table>thead>tr>td.warning,.table>tbody>tr>td.warning,.table>tfoot>tr>td.warning,.table>thead>tr>th.warning,.table>tbody>tr>th.warning,.table>tfoot>tr>th.warning,.table>thead>tr.warning>td,.table>tbody>tr.warning>td,.table>tfoot>tr.warning>td,.table>thead>tr.warning>th,.table>tbody>tr.warning>th,.table>tfoot>tr.warning>th{background-color:#fcf8e3;border-color:#fbeed5}.table-hover>tbody>tr>td.warning:hover,.table-hover>tbody>tr>th.warning:hover,.table-hover>tbody>tr.warning:hover>td,.table-hover>tbody>tr.warning:hover>th{background-color:#faf2cc;border-color:#f8e5be}@media(max-width:768px){.table-responsive{width:100%;margin-bottom:15px;overflow-x:scroll;overflow-y:hidden;border:1px solid #ddd;-ms-
 overflow-style:-ms-autohiding-scrollbar;-webkit-overflow-scrolling:touch}.table-responsive>.table{margin-bottom:0;background-color:#fff}.table-responsive>.table>thead>tr>th,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tfoot>tr>td{white-space:nowrap}.table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered>thead>tr>th:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child{border-left:0}.table-responsive>.table-bordered>thead>tr>th:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>t
 d:last-child,.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child{border-right:0}.table-responsive>.table-bordered>thead>tr:last-child>th,.table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>th,.table-responsive>.table-bordered>thead>tr:last-child>td,.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>td{border-bottom:0}}fieldset{padding:0;margin:0;border:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:inherit;color:#333;border:0;border-bottom:1px solid #e5e5e5}label{display:inline-block;margin-bottom:5px;font-weight:bold}input[type="search"]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type="radio"],input[type="checkbox"]{margin:4px 0 0;margin-top:1px \9;line-height:normal}input[type="file"]{display:block}select[multiple],sele
 ct[size]{height:auto}select optgroup{font-family:inherit;font-size:inherit;font-style:inherit}input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}input[type="number"]::-webkit-outer-spin-button,input[type="number"]::-webkit-inner-spin-button{height:auto}output{display:block;padding-top:7px;font-size:14px;line-height:1.428571429;color:#555;vertical-align:middle}.form-control:-moz-placeholder{color:#999}.form-control::-moz-placeholder{color:#999}.form-control:-ms-input-placeholder{color:#999}.form-control::-webkit-input-placeholder{color:#999}.form-control{display:block;width:100%;height:34px;padding:6px 12px;font-size:14px;line-height:1.428571429;color:#555;vertical-align:middle;background-color:#fff;border:1px solid #ccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-webkit-transition:border-color eas
 e-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s}.form-control:focus{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(102,175,233,0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(102,175,233,0.6)}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{cursor:not-allowed;background-color:#eee}textarea.form-control{height:auto}.form-group{margin-bottom:15px}.radio,.checkbox{display:block;min-height:20px;padding-left:20px;margin-top:10px;margin-bottom:10px;vertical-align:middle}.radio label,.checkbox label{display:inline;margin-bottom:0;font-weight:normal;cursor:pointer}.radio input[type="radio"],.radio-inline input[type="radio"],.checkbox input[type="checkbox"],.checkbox-inline input[type="checkbox"]{float:left;margin-left:-20px}.radio+.radio,.checkbox+.checkbox{margin-top:-5px}.radio-inline,.checkbox-inline{display:inline-block;padding-l
 eft:20px;margin-bottom:0;font-weight:normal;vertical-align:middle;cursor:pointer}.radio-inline+.radio-inline,.checkbox-inline+.checkbox-inline{margin-top:0;margin-left:10px}input[type="radio"][disabled],input[type="checkbox"][disabled],.radio[disabled],.radio-inline[disabled],.checkbox[disabled],.checkbox-inline[disabled],fieldset[disabled] input[type="radio"],fieldset[disabled] input[type="checkbox"],fieldset[disabled] .radio,fieldset[disabled] .radio-inline,fieldset[disabled] .checkbox,fieldset[disabled] .checkbox-inline{cursor:not-allowed}.input-sm{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-sm{height:30px;line-height:30px}textarea.input-sm{height:auto}.input-lg{height:45px;padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}select.input-lg{height:45px;line-height:45px}textarea.input-lg{height:auto}.has-warning .help-block,.has-warning .control-label{color:#c09853}.has-warning .form-control{border-color:#c09853;-webki
 t-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.has-warning .form-control:focus{border-color:#a47e3c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #dbc59e;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #dbc59e}.has-warning .input-group-addon{color:#c09853;background-color:#fcf8e3;border-color:#c09853}.has-error .help-block,.has-error .control-label{color:#b94a48}.has-error .form-control{border-color:#b94a48;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.has-error .form-control:focus{border-color:#953b39;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #d59392;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #d59392}.has-error .input-group-addon{color:#b94a48;background-color:#f2dede;border-color:#b94a48}.has-success .help-block,.has-success .control-label{color:#468847}.has-success .form-control{border-color:#468847;-webkit-box-shadow:inset 0 1px 1px 
 rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.has-success .form-control:focus{border-color:#356635;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7aba7b;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7aba7b}.has-success .input-group-addon{color:#468847;background-color:#dff0d8;border-color:#468847}.form-control-static{padding-top:7px;margin-bottom:0}.help-block{display:block;margin-top:5px;margin-bottom:10px;color:#737373}@media(min-width:768px){.form-inline .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.form-inline .form-control{display:inline-block}.form-inline .radio,.form-inline .checkbox{display:inline-block;padding-left:0;margin-top:0;margin-bottom:0}.form-inline .radio input[type="radio"],.form-inline .checkbox input[type="checkbox"]{float:none;margin-left:0}}.form-horizontal .control-label,.form-horizontal .radio,.form-horizontal .checkbox,.form-horizontal .radio-inline,.form-horizontal .checkbox-inline{padding
 -top:7px;margin-top:0;margin-bottom:0}.form-horizontal .form-group{margin-right:-15px;margin-left:-15px}.form-horizontal .form-group:before,.form-horizontal .form-group:after{display:table;content:" "}.form-horizontal .form-group:after{clear:both}.form-horizontal .form-group:before,.form-horizontal .form-group:after{display:table;content:" "}.form-horizontal .form-group:after{clear:both}@media(min-width:768px){.form-horizontal .control-label{text-align:right}}.btn{display:inline-block;padding:6px 12px;margin-bottom:0;font-size:14px;font-weight:normal;line-height:1.428571429;text-align:center;white-space:nowrap;vertical-align:middle;cursor:pointer;border:1px solid transparent;border-radius:4px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;-o-user-select:none;user-select:none}.btn:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn:hover,.btn:focus{color:#333;text-decoration:none}.btn:active,.btn.active{background-ima
 ge:none;outline:0;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{pointer-events:none;cursor:not-allowed;opacity:.65;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none}.btn-default{color:#333;background-color:#fff;border-color:#ccc}.btn-default:hover,.btn-default:focus,.btn-default:active,.btn-default.active,.open .dropdown-toggle.btn-default{color:#333;background-color:#ebebeb;border-color:#adadad}.btn-default:active,.btn-default.active,.open .dropdown-toggle.btn-default{background-image:none}.btn-default.disabled,.btn-default[disabled],fieldset[disabled] .btn-default,.btn-default.disabled:hover,.btn-default[disabled]:hover,fieldset[disabled] .btn-default:hover,.btn-default.disabled:focus,.btn-default[disabled]:focus,fieldset[disabled] .btn-default:focus,.btn-default.disabled:active,.btn-default[disabled]:active,fieldset[disabled] .btn-default:active,.btn-default.dis
 abled.active,.btn-default[disabled].active,fieldset[disabled] .btn-default.active{background-color:#fff;border-color:#ccc}.btn-primary{color:#fff;background-color:#428bca;border-color:#357ebd}.btn-primary:hover,.btn-primary:focus,.btn-primary:active,.btn-primary.active,.open .dropdown-toggle.btn-primary{color:#fff;background-color:#3276b1;border-color:#285e8e}.btn-primary:active,.btn-primary.active,.open .dropdown-toggle.btn-primary{background-image:none}.btn-primary.disabled,.btn-primary[disabled],fieldset[disabled] .btn-primary,.btn-primary.disabled:hover,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary:hover,.btn-primary.disabled:focus,.btn-primary[disabled]:focus,fieldset[disabled] .btn-primary:focus,.btn-primary.disabled:active,.btn-primary[disabled]:active,fieldset[disabled] .btn-primary:active,.btn-primary.disabled.active,.btn-primary[disabled].active,fieldset[disabled] .btn-primary.active{background-color:#428bca;border-color:#357ebd}.btn-warning{color:#fff;backg
 round-color:#f0ad4e;border-color:#eea236}.btn-warning:hover,.btn-warning:focus,.btn-warning:active,.btn-warning.active,.open .dropdown-toggle.btn-warning{color:#fff;background-color:#ed9c28;border-color:#d58512}.btn-warning:active,.btn-warning.active,.open .dropdown-toggle.btn-warning{background-image:none}.btn-warning.disabled,.btn-warning[disabled],fieldset[disabled] .btn-warning,.btn-warning.disabled:hover,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning:hover,.btn-warning.disabled:focus,.btn-warning[disabled]:focus,fieldset[disabled] .btn-warning:focus,.btn-warning.disabled:active,.btn-warning[disabled]:active,fieldset[disabled] .btn-warning:active,.btn-warning.disabled.active,.btn-warning[disabled].active,fieldset[disabled] .btn-warning.active{background-color:#f0ad4e;border-color:#eea236}.btn-danger{color:#fff;background-color:#d9534f;border-color:#d43f3a}.btn-danger:hover,.btn-danger:focus,.btn-danger:active,.btn-danger.active,.open .dropdown-toggle.btn-danger{col
 or:#fff;background-color:#d2322d;border-color:#ac2925}.btn-danger:active,.btn-danger.active,.open .dropdown-toggle.btn-danger{background-image:none}.btn-danger.disabled,.btn-danger[disabled],fieldset[disabled] .btn-danger,.btn-danger.disabled:hover,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger:hover,.btn-danger.disabled:focus,.btn-danger[disabled]:focus,fieldset[disabled] .btn-danger:focus,.btn-danger.disabled:active,.btn-danger[disabled]:active,fieldset[disabled] .btn-danger:active,.btn-danger.disabled.active,.btn-danger[disabled].active,fieldset[disabled] .btn-danger.active{background-color:#d9534f;border-color:#d43f3a}.btn-success{color:#fff;background-color:#5cb85c;border-color:#4cae4c}.btn-success:hover,.btn-success:focus,.btn-success:active,.btn-success.active,.open .dropdown-toggle.btn-success{color:#fff;background-color:#47a447;border-color:#398439}.btn-success:active,.btn-success.active,.open .dropdown-toggle.btn-success{background-image:none}.btn-success.disab
 led,.btn-success[disabled],fieldset[disabled] .btn-success,.btn-success.disabled:hover,.btn-success[disabled]:hover,fieldset[disabled] .btn-success:hover,.btn-success.disabled:focus,.btn-success[disabled]:focus,fieldset[disabled] .btn-success:focus,.btn-success.disabled:active,.btn-success[disabled]:active,fieldset[disabled] .btn-success:active,.btn-success.disabled.active,.btn-success[disabled].active,fieldset[disabled] .btn-success.active{background-color:#5cb85c;border-color:#4cae4c}.btn-info{color:#fff;background-color:#5bc0de;border-color:#46b8da}.btn-info:hover,.btn-info:focus,.btn-info:active,.btn-info.active,.open .dropdown-toggle.btn-info{color:#fff;background-color:#39b3d7;border-color:#269abc}.btn-info:active,.btn-info.active,.open .dropdown-toggle.btn-info{background-image:none}.btn-info.disabled,.btn-info[disabled],fieldset[disabled] .btn-info,.btn-info.disabled:hover,.btn-info[disabled]:hover,fieldset[disabled] .btn-info:hover,.btn-info.disabled:focus,.btn-info[disable
 d]:focus,fieldset[disabled] .btn-info:focus,.btn-info.disabled:active,.btn-info[disabled]:active,fieldset[disabled] .btn-info:active,.btn-info.disabled.active,.btn-info[disabled].active,fieldset[disabled] .btn-info.active{background-color:#5bc0de;border-color:#46b8da}.btn-link{font-weight:normal;color:#428bca;cursor:pointer;border-radius:0}.btn-link,.btn-link:active,.btn-link[disabled],fieldset[disabled] .btn-link{background-color:transparent;-webkit-box-shadow:none;box-shadow:none}.btn-link,.btn-link:hover,.btn-link:focus,.btn-link:active{border-color:transparent}.btn-link:hover,.btn-link:focus{color:#2a6496;text-decoration:underline;background-color:transparent}.btn-link[disabled]:hover,fieldset[disabled] .btn-link:hover,.btn-link[disabled]:focus,fieldset[disabled] .btn-link:focus{color:#999;text-decoration:none}.btn-lg{padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}.btn-sm,.btn-xs{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-xs{paddi
 ng:1px 5px}.btn-block{display:block;width:100%;padding-right:0;padding-left:0}.btn-block+.btn-block{margin-top:5px}input[type="submit"].btn-block,input[type="reset"].btn-block,input[type="button"].btn-block{width:100%}.fade{opacity:0;-webkit-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{display:none}.collapse.in{display:block}.collapsing{position:relative;height:0;overflow:hidden;-webkit-transition:height .35s ease;transition:height .35s ease}@font-face{font-family:'Glyphicons Halflings';src:url('../fonts/glyphicons-halflings-regular.eot');src:url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'),url('../fonts/glyphicons-halflings-regular.woff') format('woff'),url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'),url('../fonts/glyphicons-halflings-regular.svg#glyphicons-halflingsregular') format('svg')}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';-
 webkit-font-smoothing:antialiased;font-style:normal;font-weight:normal;line-height:1}.glyphicon:empty{width:1em}.glyphicon-asterisk:before{content:"\2a"}.glyphicon-plus:before{content:"\2b"}.glyphicon-euro:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e0
 16"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:before{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeat:before{content:"\e030"}.glyphicon-refresh:before{content:"\e031"}.glyphicon-list-alt:before{content:"\e032"}.glyphicon-flag:before{content:"\e034"}.glyphicon-headphones:before{content:"\e035"}.glyphicon-volume-off:before{content:"\e036"}.glyphicon-volume-down:before{content:"\e037"}.glyphicon-volume-up:before{content:"\e038"}.glyphicon-qrcode:before{content:"\e039"}.glyphicon-barcode:before{content:"\e040"}.glyphicon-tag:before{content:"\e04
 1"}.glyphicon-tags:before{content:"\e042"}.glyphicon-book:before{content:"\e043"}.glyphicon-print:before{content:"\e045"}.glyphicon-font:before{content:"\e047"}.glyphicon-bold:before{content:"\e048"}.glyphicon-italic:before{content:"\e049"}.glyphicon-text-height:before{content:"\e050"}.glyphicon-text-width:before{content:"\e051"}.glyphicon-align-left:before{content:"\e052"}.glyphicon-align-center:before{content:"\e053"}.glyphicon-align-right:before{content:"\e054"}.glyphicon-align-justify:before{content:"\e055"}.glyphicon-list:before{content:"\e056"}.glyphicon-indent-left:before{content:"\e057"}.glyphicon-indent-right:before{content:"\e058"}.glyphicon-facetime-video:before{content:"\e059"}.glyphicon-picture:before{content:"\e060"}.glyphicon-map-marker:before{content:"\e062"}.glyphicon-adjust:before{content:"\e063"}.glyphicon-tint:before{content:"\e064"}.glyphicon-edit:before{content:"\e065"}.glyphicon-share:before{content:"\e066"}.glyphicon-check:before{content:"\e067"}.glyphicon-mo
 ve:before{content:"\e068"}.glyphicon-step-backward:before{content:"\e069"}.glyphicon-fast-backward:before{content:"\e070"}.glyphicon-backward:before{content:"\e071"}.glyphicon-play:before{content:"\e072"}.glyphicon-pause:before{content:"\e073"}.glyphicon-stop:before{content:"\e074"}.glyphicon-forward:before{content:"\e075"}.glyphicon-fast-forward:before{content:"\e076"}.glyphicon-step-forward:before{content:"\e077"}.glyphicon-eject:before{content:"\e078"}.glyphicon-chevron-left:before{content:"\e079"}.glyphicon-chevron-right:before{content:"\e080"}.glyphicon-plus-sign:before{content:"\e081"}.glyphicon-minus-sign:before{content:"\e082"}.glyphicon-remove-sign:before{content:"\e083"}.glyphicon-ok-sign:before{content:"\e084"}.glyphicon-question-sign:before{content:"\e085"}.glyphicon-info-sign:before{content:"\e086"}.glyphicon-screenshot:before{content:"\e087"}.glyphicon-remove-circle:before{content:"\e088"}.glyphicon-ok-circle:before{content:"\e089"}.glyphicon-ban-circle:before{content:
 "\e090"}.glyphicon-arrow-left:before{content:"\e091"}.glyphicon-arrow-right:before{content:"\e092"}.glyphicon-arrow-up:before{content:"\e093"}.glyphicon-arrow-down:before{content:"\e094"}.glyphicon-share-alt:before{content:"\e095"}.glyphicon-resize-full:before{content:"\e096"}.glyphicon-resize-small:before{content:"\e097"}.glyphicon-exclamation-sign:before{content:"\e101"}.glyphicon-gift:before{content:"\e102"}.glyphicon-leaf:before{content:"\e103"}.glyphicon-eye-open:before{content:"\e105"}.glyphicon-eye-close:before{content:"\e106"}.glyphicon-warning-sign:before{content:"\e107"}.glyphicon-plane:before{content:"\e108"}.glyphicon-random:before{content:"\e110"}.glyphicon-comment:before{content:"\e111"}.glyphicon-magnet:before{content:"\e112"}.glyphicon-chevron-up:before{content:"\e113"}.glyphicon-chevron-down:before{content:"\e114"}.glyphicon-retweet:before{content:"\e115"}.glyphicon-shopping-cart:before{content:"\e116"}.glyphicon-folder-close:before{content:"\e117"}.glyphicon-folder
 -open:before{content:"\e118"}.glyphicon-resize-vertical:before{content:"\e119"}.glyphicon-resize-horizontal:before{content:"\e120"}.glyphicon-hdd:before{content:"\e121"}.glyphicon-bullhorn:before{content:"\e122"}.glyphicon-certificate:before{content:"\e124"}.glyphicon-thumbs-up:before{content:"\e125"}.glyphicon-thumbs-down:before{content:"\e126"}.glyphicon-hand-right:before{content:"\e127"}.glyphicon-hand-left:before{content:"\e128"}.glyphicon-hand-up:before{content:"\e129"}.glyphicon-hand-down:before{content:"\e130"}.glyphicon-circle-arrow-right:before{content:"\e131"}.glyphicon-circle-arrow-left:before{content:"\e132"}.glyphicon-circle-arrow-up:before{content:"\e133"}.glyphicon-circle-arrow-down:before{content:"\e134"}.glyphicon-globe:before{content:"\e135"}.glyphicon-tasks:before{content:"\e137"}.glyphicon-filter:before{content:"\e138"}.glyphicon-fullscreen:before{content:"\e140"}.glyphicon-dashboard:before{content:"\e141"}.glyphicon-heart-empty:before{content:"\e143"}.glyphicon-
 link:before{content:"\e144"}.glyphicon-phone:before{content:"\e145"}.glyphicon-usd:before{content:"\e148"}.glyphicon-gbp:before{content:"\e149"}.glyphicon-sort:before{content:"\e150"}.glyphicon-sort-by-alphabet:before{content:"\e151"}.glyphicon-sort-by-alphabet-alt:before{content:"\e152"}.glyphicon-sort-by-order:before{content:"\e153"}.glyphicon-sort-by-order-alt:before{content:"\e154"}.glyphicon-sort-by-attributes:before{content:"\e155"}.glyphicon-sort-by-attributes-alt:before{content:"\e156"}.glyphicon-unchecked:before{content:"\e157"}.glyphicon-expand:before{content:"\e158"}.glyphicon-collapse-down:before{content:"\e159"}.glyphicon-collapse-up:before{content:"\e160"}.glyphicon-log-in:before{content:"\e161"}.glyphicon-flash:before{content:"\e162"}.glyphicon-log-out:before{content:"\e163"}.glyphicon-new-window:before{content:"\e164"}.glyphicon-record:before{content:"\e165"}.glyphicon-save:before{content:"\e166"}.glyphicon-open:before{content:"\e167"}.glyphicon-saved:before{content:
 "\e168"}.glyphicon-import:before{content:"\e169"}.glyphicon-export:before{content:"\e170"}.glyphicon-send:before{content:"\e171"}.glyphicon-floppy-disk:before{content:"\e172"}.glyphicon-floppy-saved:before{content:"\e173"}.glyphicon-floppy-remove:before{content:"\e174"}.glyphicon-floppy-save:before{content:"\e175"}.glyphicon-floppy-open:before{content:"\e176"}.glyphicon-credit-card:before{content:"\e177"}.glyphicon-transfer:before{content:"\e178"}.glyphicon-cutlery:before{content:"\e179"}.glyphicon-header:before{content:"\e180"}.glyphicon-compressed:before{content:"\e181"}.glyphicon-earphone:before{content:"\e182"}.glyphicon-phone-alt:before{content:"\e183"}.glyphicon-tower:before{content:"\e184"}.glyphicon-stats:before{content:"\e185"}.glyphicon-sd-video:before{content:"\e186"}.glyphicon-hd-video:before{content:"\e187"}.glyphicon-subtitles:before{content:"\e188"}.glyphicon-sound-stereo:before{content:"\e189"}.glyphicon-sound-dolby:before{content:"\e190"}.glyphicon-sound-5-1:before{
 content:"\e191"}.glyphicon-sound-6-1:before{content:"\e192"}.glyphicon-sound-7-1:before{content:"\e193"}.glyphicon-copyright-mark:before{content:"\e194"}.glyphicon-registration-mark:before{content:"\e195"}.glyphicon-cloud-download:before{content:"\e197"}.glyphicon-cloud-upload:before{content:"\e198"}.glyphicon-tree-conifer:before{content:"\e199"}.glyphicon-tree-deciduous:before{content:"\e200"}.glyphicon-briefcase:before{content:"\1f4bc"}.glyphicon-calendar:before{content:"\1f4c5"}.glyphicon-pushpin:before{content:"\1f4cc"}.glyphicon-paperclip:before{content:"\1f4ce"}.glyphicon-camera:before{content:"\1f4f7"}.glyphicon-lock:before{content:"\1f512"}.glyphicon-bell:before{content:"\1f514"}.glyphicon-bookmark:before{content:"\1f516"}.glyphicon-fire:before{content:"\1f525"}.glyphicon-wrench:before{content:"\1f527"}.caret{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px solid #000;border-right:4px solid transparent;border-bottom:0 dotted;border-l
 eft:4px solid transparent;content:""}.dropdown{position:relative}.dropdown-toggle:focus{outline:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;font-size:14px;list-style:none;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,0.175);box-shadow:0 6px 12px rgba(0,0,0,0.175);background-clip:padding-box}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:normal;line-height:1.428571429;color:#333;white-space:nowrap}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus{color:#fff;text-decoration:none;background-color:#428bca}.dropdown-menu>.active>a,.dropdown-menu>.active>a:hover,.dropdown-menu>.active>a:focus{color:#fff;text-decoration:none;background-color:#428bca;outl
 ine:0}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{color:#999}.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{text-decoration:none;cursor:not-allowed;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.open>.dropdown-menu{display:block}.open>a{outline:0}.dropdown-header{display:block;padding:3px 20px;font-size:12px;line-height:1.428571429;color:#999}.dropdown-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:990}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{border-top:0 dotted;border-bottom:4px solid #000;content:""}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:1px}@media(min-width:768px){.navbar-right .dropdown-menu{right:0;left:auto}}.btn-default .caret{border-top-color:#333}.btn-primary .caret,.btn-success .caret,.btn-warning .care
 t,.btn-danger .caret,.btn-info .caret{border-top-color:#fff}.dropup .btn-default .caret{border-bottom-color:#333}.dropup .btn-primary .caret,.dropup .btn-success .caret,.dropup .btn-warning .caret,.dropup .btn-danger .caret,.dropup .btn-info .caret{border-bottom-color:#fff}.btn-group,.btn-group-vertical{position:relative;display:inline-block;vertical-align:middle}.btn-group>.btn,.btn-group-vertical>.btn{position:relative;float:left}.btn-group>.btn:hover,.btn-group-vertical>.btn:hover,.btn-group>.btn:focus,.btn-group-vertical>.btn:focus,.btn-group>.btn:active,.btn-group-vertical>.btn:active,.btn-group>.btn.active,.btn-group-vertical>.btn.active{z-index:2}.btn-group>.btn:focus,.btn-group-vertical>.btn:focus{outline:0}.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group{margin-left:-1px}.btn-toolbar:before,.btn-toolbar:after{display:table;content:" "}.btn-toolbar:after{clear:both}.btn-toolbar:before,.btn-toolbar:after{display:table
 ;content:" "}.btn-toolbar:after{clear:both}.btn-toolbar .btn-group{float:left}.btn-toolbar>.btn+.btn,.btn-toolbar>.btn-group+.btn,.btn-toolbar>.btn+.btn-group,.btn-toolbar>.btn-group+.btn-group{margin-left:5px}.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){border-radius:0}.btn-group>.btn:first-child{margin-left:0}.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn:last-child:not(:first-child),.btn-group>.dropdown-toggle:not(:first-child){border-bottom-left-radius:0;border-top-left-radius:0}.btn-group>.btn-group{float:left}.btn-group>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group>.btn-group:first-child>.btn:last-child,.btn-group>.btn-group:first-child>.dropdown-toggle{border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn-group:last-child>.btn:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.btn-group .dropdown
 -toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group-xs>.btn{padding:5px 10px;padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px}.btn-group-sm>.btn{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-group-lg>.btn{padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}.btn-group>.btn+.dropdown-toggle{padding-right:8px;padding-left:8px}.btn-group>.btn-lg+.dropdown-toggle{padding-right:12px;padding-left:12px}.btn-group.open .dropdown-toggle{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)}.btn .caret{margin-left:0}.btn-lg .caret{border-width:5px 5px 0;border-bottom-width:0}.dropup .btn-lg .caret{border-width:0 5px 5px}.btn-group-vertical>.btn,.btn-group-vertical>.btn-group{display:block;float:none;width:100%;max-width:100%}.btn-group-vertical>.btn-group:before,.btn-group-vertical>.btn-group:after{display:table;content:" "}.btn-group-vertical>.btn-group:after{clear:both}.btn-g
 roup-vertical>.btn-group:before,.btn-group-vertical>.btn-group:after{display:table;content:" "}.btn-group-vertical>.btn-group:after{clear:both}.btn-group-vertical>.btn-group>.btn{float:none}.btn-group-vertical>.btn+.btn,.btn-group-vertical>.btn+.btn-group,.btn-group-vertical>.btn-group+.btn,.btn-group-vertical>.btn-group+.btn-group{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn:not(:first-child):not(:last-child){border-radius:0}.btn-group-vertical>.btn:first-child:not(:last-child){border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn:last-child:not(:first-child){border-top-right-radius:0;border-bottom-left-radius:4px;border-top-left-radius:0}.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group-vertical>.btn-group:first-child>.btn:last-child,.btn-group-vertical>.btn-group:first-child>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>
 .btn-group:last-child>.btn:first-child{border-top-right-radius:0;border-top-left-radius:0}.btn-group-justified{display:table;width:100%;border-collapse:separate;table-layout:fixed}.btn-group-justified .btn{display:table-cell;float:none;width:1%}[data-toggle="buttons"]>.btn>input[type="radio"],[data-toggle="buttons"]>.btn>input[type="checkbox"]{display:none}.input-group{position:relative;display:table;border-collapse:separate}.input-group.col{float:none;padding-right:0;padding-left:0}.input-group .form-control{width:100%;margin-bottom:0}.input-group-lg>.form-control,.input-group-lg>.input-group-addon,.input-group-lg>.input-group-btn>.btn{height:45px;padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}select.input-group-lg>.form-control,select.input-group-lg>.input-group-addon,select.input-group-lg>.input-group-btn>.btn{height:45px;line-height:45px}textarea.input-group-lg>.form-control,textarea.input-group-lg>.input-group-addon,textarea.input-group-lg>.input-group-btn>
 .btn{height:auto}.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-group-sm>.form-control,select.input-group-sm>.input-group-addon,select.input-group-sm>.input-group-btn>.btn{height:30px;line-height:30px}textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon,textarea.input-group-sm>.input-group-btn>.btn{height:auto}.input-group-addon,.input-group-btn,.input-group .form-control{display:table-cell}.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child),.input-group .form-control:not(:first-child):not(:last-child){border-radius:0}.input-group-addon,.input-group-btn{width:1%;white-space:nowrap;vertical-align:middle}.input-group-addon{padding:6px 12px;font-size:14px;font-weight:normal;line-height:1;text-align:center;background-color:#eee;border:1px solid #ccc;border-radiu
 s:4px}.input-group-addon.input-sm{padding:5px 10px;font-size:12px;border-radius:3px}.input-group-addon.input-lg{padding:10px 16px;font-size:18px;border-radius:6px}.input-group-addon input[type="radio"],.input-group-addon input[type="checkbox"]{margin-top:0}.input-group .form-control:first-child,.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.input-group-addon:first-child{border-right:0}.input-group .form-control:last-child,.input-group-addon:last-child,.input-group-btn:last-child>.btn,.input-group-btn:last-child>.dropdown-toggle,.input-group-btn:first-child>.btn:not(:first-child){border-bottom-left-radius:0;border-top-left-radius:0}.input-group-addon:last-child{border-left:0}.input-group-btn{position:relative;white-space:nowrap}.input-group-btn>.btn{position:relative}.input-group-btn>.btn+.btn{m
 argin-left:-4px}.input-group-btn>.btn:hover,.input-group-btn>.btn:active{z-index:2}.nav{padding-left:0;margin-bottom:0;list-style:none}.nav:before,.nav:after{display:table;content:" "}.nav:after{clear:both}.nav:before,.nav:after{display:table;content:" "}.nav:after{clear:both}.nav>li{position:relative;display:block}.nav>li>a{position:relative;display:block;padding:10px 15px}.nav>li>a:hover,.nav>li>a:focus{text-decoration:none;background-color:#eee}.nav>li.disabled>a{color:#999}.nav>li.disabled>a:hover,.nav>li.disabled>a:focus{color:#999;text-decoration:none;cursor:not-allowed;background-color:transparent}.nav .open>a,.nav .open>a:hover,.nav .open>a:focus{background-color:#eee;border-color:#428bca}.nav .nav-divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.nav>li>a>img{max-width:none}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{float:left;margin-bottom:-1px}.nav-tabs>li>a{margin-right:2px;line-height:1.428571429;border:1px solid transparent;border-radiu
 s:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd}.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{color:#555;cursor:default;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent}.nav-tabs.nav-justified{width:100%;border-bottom:0}.nav-tabs.nav-justified>li{float:none}.nav-tabs.nav-justified>li>a{margin-bottom:5px;text-align:center}@media(min-width:768px){.nav-tabs.nav-justified>li{display:table-cell;width:1%}.nav-tabs.nav-justified>li>a{margin-bottom:0}}.nav-tabs.nav-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{border:1px solid #ddd}@media(min-width:768px){.nav-tabs.nav-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{border-bottom-color:#fff}}.nav-pills>li{float:left}.nav
 -pills>li>a{border-radius:5px}.nav-pills>li+li{margin-left:2px}.nav-pills>li.active>a,.nav-pills>li.active>a:hover,.nav-pills>li.active>a:focus{color:#fff;background-color:#428bca}.nav-stacked>li{float:none}.nav-stacked>li+li{margin-top:2px;margin-left:0}.nav-justified{width:100%}.nav-justified>li{float:none}.nav-justified>li>a{margin-bottom:5px;text-align:center}@media(min-width:768px){.nav-justified>li{display:table-cell;width:1%}.nav-justified>li>a{margin-bottom:0}}.nav-tabs-justified{border-bottom:0}.nav-tabs-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:hover,.nav-tabs-justified>.active>a:focus{border:1px solid #ddd}@media(min-width:768px){.nav-tabs-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:hover,.nav-tabs-justified>.active>a:focus{border-bottom-color:#fff}}.tabbable:before,.tabbable:after{display:table;content:" "}.tabbable:after
 {clear:both}.tabbable:before,.tabbable:after{display:table;content:" "}.tabbable:after{clear:both}.tab-content>.tab-pane,.pill-content>.pill-pane{display:none}.tab-content>.active,.pill-content>.active{display:block}.nav .caret{border-top-color:#428bca;border-bottom-color:#428bca}.nav a:hover .caret{border-top-color:#2a6496;border-bottom-color:#2a6496}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-right-radius:0;border-top-left-radius:0}.navbar{position:relative;z-index:1000;min-height:50px;margin-bottom:20px;border:1px solid transparent}.navbar:before,.navbar:after{display:table;content:" "}.navbar:after{clear:both}.navbar:before,.navbar:after{display:table;content:" "}.navbar:after{clear:both}@media(min-width:768px){.navbar{border-radius:4px}}.navbar-header:before,.navbar-header:after{display:table;content:" "}.navbar-header:after{clear:both}.navbar-header:before,.navbar-header:after{display:table;content:" "}.navbar-header:after{clear:both}@media(min-width:768px){.navbar-hea
 der{float:left}}.navbar-collapse{max-height:340px;padding-right:15px;padding-left:15px;overflow-x:visible;border-top:1px solid transparent;box-shadow:inset 0 1px 0 rgba(255,255,255,0.1);-webkit-overflow-scrolling:touch}.navbar-collapse:before,.navbar-collapse:after{display:table;content:" "}.navbar-collapse:after{clear:both}.navbar-collapse:before,.navbar-collapse:after{display:table;content:" "}.navbar-collapse:after{clear:both}.navbar-collapse.in{overflow-y:auto}@media(min-width:768px){.navbar-collapse{width:auto;border-top:0;box-shadow:none}.navbar-collapse.collapse{display:block!important;height:auto!important;padding-bottom:0;overflow:visible!important}.navbar-collapse.in{overflow-y:visible}.navbar-collapse .navbar-nav.navbar-left:first-child{margin-left:-15px}.navbar-collapse .navbar-nav.navbar-right:last-child{margin-right:-15px}.navbar-collapse .navbar-text:last-child{margin-right:0}}.container>.navbar-header,.container>.navbar-collapse{margin-right:-15px;margin-left:-15px}@
 media(min-width:768px){.container>.navbar-header,.container>.navbar-collapse{margin-right:0;margin-left:0}}.navbar-static-top{border-width:0 0 1px}@media(min-width:768px){.navbar-static-top{border-radius:0}}.navbar-fixed-top,.navbar-fixed-bottom{position:fixed;right:0;left:0;border-width:0 0 1px}@media(min-width:768px){.navbar-fixed-top,.navbar-fixed-bottom{border-radius:0}}.navbar-fixed-top{top:0;z-index:1030}.navbar-fixed-bottom{bottom:0;margin-bottom:0}.navbar-brand{float:left;padding:15px 15px;font-size:18px;line-height:20px}.navbar-brand:hover,.navbar-brand:focus{text-decoration:none}@media(min-width:768px){.navbar>.container .navbar-brand{margin-left:-15px}}.navbar-toggle{position:relative;float:right;padding:9px 10px;margin-top:8px;margin-right:15px;margin-bottom:8px;background-color:transparent;border:1px solid transparent;border-radius:4px}.navbar-toggle .icon-bar{display:block;width:22px;height:2px;border-radius:1px}.navbar-toggle .icon-bar+.icon-bar{margin-top:4px}@media(
 min-width:768px){.navbar-toggle{display:none}}.navbar-nav{margin:7.5px -15px}.navbar-nav>li>a{padding-top:10px;padding-bottom:10px;line-height:20px}@media(max-width:767px){.navbar-nav .open .dropdown-menu{position:static;float:none;width:auto;margin-top:0;background-color:transparent;border:0;box-shadow:none}.navbar-nav .open .dropdown-menu>li>a,.navbar-nav .open .dropdown-menu .dropdown-header{padding:5px 15px 5px 25px}.navbar-nav .open .dropdown-menu>li>a{line-height:20px}.navbar-nav .open .dropdown-menu>li>a:hover,.navbar-nav .open .dropdown-menu>li>a:focus{background-image:none}}@media(min-width:768px){.navbar-nav{float:left;margin:0}.navbar-nav>li{float:left}.navbar-nav>li>a{padding-top:15px;padding-bottom:15px}}@media(min-width:768px){.navbar-left{float:left!important}.navbar-right{float:right!important}}.navbar-form{padding:10px 15px;margin-top:8px;margin-right:-15px;margin-bottom:8px;margin-left:-15px;border-top:1px solid transparent;border-bottom:1px solid transparent;-webk
 it-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1);box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1)}@media(min-width:768px){.navbar-form .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.navbar-form .form-control{display:inline-block}.navbar-form .radio,.navbar-form .checkbox{display:inline-block;padding-left:0;margin-top:0;margin-bottom:0}.navbar-form .radio input[type="radio"],.navbar-form .checkbox input[type="checkbox"]{float:none;margin-left:0}}@media(max-width:767px){.navbar-form .form-group{margin-bottom:5px}}@media(min-width:768px){.navbar-form{width:auto;padding-top:0;padding-bottom:0;margin-right:0;margin-left:0;border:0;-webkit-box-shadow:none;box-shadow:none}}.navbar-nav>li>.dropdown-menu{margin-top:0;border-top-right-radius:0;border-top-left-radius:0}.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{border-bottom-right-radius:0;border-bottom-left-radius:0}.navbar-nav.pull-right>li>.dropdown-
 menu,.navbar-nav>li>.dropdown-menu.pull-right{right:0;left:auto}.navbar-btn{margin-top:8px;margin-bottom:8px}.navbar-text{float:left;margin-top:15px;margin-bottom:15px}@media(min-width:768px){.navbar-text{margin-right:15px;margin-left:15px}}.navbar-default{background-color:#f8f8f8;border-color:#e7e7e7}.navbar-default .navbar-brand{color:#777}.navbar-default .navbar-brand:hover,.navbar-default .navbar-brand:focus{color:#5e5e5e;background-color:transparent}.navbar-default .navbar-text{color:#777}.navbar-default .navbar-nav>li>a{color:#777}.navbar-default .navbar-nav>li>a:hover,.navbar-default .navbar-nav>li>a:focus{color:#333;background-color:transparent}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:hover,.navbar-default .navbar-nav>.active>a:focus{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav>.disabled>a,.navbar-default .navbar-nav>.disabled>a:hover,.navbar-default .navbar-nav>.disabled>a:focus{color:#ccc;background-color:transparent}.n
 avbar-default .navbar-toggle{border-color:#ddd}.navbar-default .navbar-toggle:hover,.navbar-default .navbar-toggle:focus{background-color:#ddd}.navbar-default .navbar-toggle .icon-bar{background-color:#ccc}.navbar-default .navbar-collapse,.navbar-default .navbar-form{border-color:#e6e6e6}.navbar-default .navbar-nav>.dropdown>a:hover .caret,.navbar-default .navbar-nav>.dropdown>a:focus .caret{border-top-color:#333;border-bottom-color:#333}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:hover,.navbar-default .navbar-nav>.open>a:focus{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav>.open>a .caret,.navbar-default .navbar-nav>.open>a:hover .caret,.navbar-default .navbar-nav>.open>a:focus .caret{border-top-color:#555;border-bottom-color:#555}.navbar-default .navbar-nav>.dropdown>a .caret{border-top-color:#777;border-bottom-color:#777}@media(max-width:767px){.navbar-default .navbar-nav .open .dropdown-menu>li>a{color:#777}.navbar-default .navbar-nav 
 .open .dropdown-menu>li>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>li>a:focus{color:#333;background-color:transparent}.navbar-default .navbar-nav .open .dropdown-menu>.active>a,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:focus{color:#ccc;background-color:transparent}}.navbar-default .navbar-link{color:#777}.navbar-default .navbar-link:hover{color:#333}.navbar-inverse{background-color:#222;border-color:#080808}.navbar-inverse .navbar-brand{color:#999}.navbar-inverse .navbar-brand:hover,.navbar-inverse .navbar-brand:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-text{color:#999}.navbar-inverse .navbar-nav>li>a{color:#999}.navbar-inverse .navba
 r-nav>li>a:hover,.navbar-inverse .navbar-nav>li>a:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:hover,.navbar-inverse .navbar-nav>.active>a:focus{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.disabled>a,.navbar-inverse .navbar-nav>.disabled>a:hover,.navbar-inverse .navbar-nav>.disabled>a:focus{color:#444;background-color:transparent}.navbar-inverse .navbar-toggle{border-color:#333}.navbar-inverse .navbar-toggle:hover,.navbar-inverse .navbar-toggle:focus{background-color:#333}.navbar-inverse .navbar-toggle .icon-bar{background-color:#fff}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#101010}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:hover,.navbar-inverse .navbar-nav>.open>a:focus{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.dropdown>a:hover .caret{border-top-color:#fff;border-bottom-color:#fff}.navbar-inverse .nav
 bar-nav>.dropdown>a .caret{border-top-color:#999;border-bottom-color:#999}.navbar-inverse .navbar-nav>.open>a .caret,.navbar-inverse .navbar-nav>.open>a:hover .caret,.navbar-inverse .navbar-nav>.open>a:focus .caret{border-top-color:#fff;border-bottom-color:#fff}@media(max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a{color:#999}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:hover,.navbar-inverse .navbar-nav .open .dropdown-me
 nu>.disabled>a:focus{color:#444;background-color:transparent}}.navbar-inverse .navbar-link{color:#999}.navbar-inverse .navbar-link:hover{color:#fff}.breadcrumb{padding:8px 15px;margin-bottom:20px;list-style:none;background-color:#f5f5f5;border-radius:4px}.breadcrumb>li{display:inline-block}.breadcrumb>li+li:before{padding:0 5px;color:#ccc;content:"/\00a0"}.breadcrumb>.active{color:#999}.pagination{display:inline-block;padding-left:0;margin:20px 0;border-radius:4px}.pagination>li{display:inline}.pagination>li>a,.pagination>li>span{position:relative;float:left;padding:6px 12px;margin-left:-1px;line-height:1.428571429;text-decoration:none;background-color:#fff;border:1px solid #ddd}.pagination>li:first-child>a,.pagination>li:first-child>span{margin-left:0;border-bottom-left-radius:4px;border-top-left-radius:4px}.pagination>li:last-child>a,.pagination>li:last-child>span{border-top-right-radius:4px;border-bottom-right-radius:4px}.pagination>li>a:hover,.pagination>li>span:hover,.paginatio
 n>li>a:focus,.pagination>li>span:focus{background-color:#eee}.pagination>.active>a,.pagination>.active>span,.pagination>.active>a:hover,.pagination>.active>span:hover,.pagination>.active>a:focus,.pagination>.active>span:focus{z-index:2;color:#fff;cursor:default;background-color:#428bca;border-color:#428bca}.pagination>.disabled>span,.pagination>.disabled>span:hover,.pagination>.disabled>span:focus,.pagination>.disabled>a,.pagination>.disabled>a:hover,.pagination>.disabled>a:focus{color:#999;cursor:not-allowed;background-color:#fff;border-color:#ddd}.pagination-lg>li>a,.pagination-lg>li>span{padding:10px 16px;font-size:18px}.pagination-lg>li:first-child>a,.pagination-lg>li:first-child>span{border-bottom-left-radius:6px;border-top-left-radius:6px}.pagination-lg>li:last-child>a,.pagination-lg>li:last-child>span{border-top-right-radius:6px;border-bottom-right-radius:6px}.pagination-sm>li>a,.pagination-sm>li>span{padding:5px 10px;font-size:12px}.pagination-sm>li:first-child>a,.pagination
 -sm>li:first-child>span{border-bottom-left-radius:3px;border-top-left-radius:3px}.pagination-sm>li:last-child>a,.pagination-sm>li:last-child>span{border-top-right-radius:3px;border-bottom-right-radius:3px}.pager{padding-left:0;margin:20px 0;text-align:center;list-style:none}.pager:before,.pager:after{display:table;content:" "}.pager:after{clear:both}.pager:before,.pager:after{display:table;content:" "}.pager:after{clear:both}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;border-radius:15px}.pager li>a:hover,.pager li>a:focus{text-decoration:none;background-color:#eee}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:hover,.pager .disabled>a:focus,.pager .disabled>span{color:#999;cursor:not-allowed;background-color:#fff}.label{display:inline;padding:.2em .6em .3em;font-size:75%;font-weight:bold;line-height:1;color:
 #fff;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25em}.label[href]:hover,.label[href]:focus{color:#fff;text-decoration:none;cursor:pointer}.label:empty{display:none}.label-default{background-color:#999}.label-default[href]:hover,.label-default[href]:focus{background-color:#808080}.label-primary{background-color:#428bca}.label-primary[href]:hover,.label-primary[href]:focus{background-color:#3071a9}.label-success{background-color:#5cb85c}.label-success[href]:hover,.label-success[href]:focus{background-color:#449d44}.label-info{background-color:#5bc0de}.label-info[href]:hover,.label-info[href]:focus{background-color:#31b0d5}.label-warning{background-color:#f0ad4e}.label-warning[href]:hover,.label-warning[href]:focus{background-color:#ec971f}.label-danger{background-color:#d9534f}.label-danger[href]:hover,.label-danger[href]:focus{background-color:#c9302c}.badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:12px;font-weight:bold;line-heigh
 t:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;background-color:#999;border-radius:10px}.badge:empty{display:none}a.badge:hover,a.badge:focus{color:#fff;text-decoration:none;cursor:pointer}.btn .badge{position:relative;top:-1px}a.list-group-item.active>.badge,.nav-pills>.active>a>.badge{color:#428bca;background-color:#fff}.nav-pills>li>a>.badge{margin-left:3px}.jumbotron{padding:30px;margin-bottom:30px;font-size:21px;font-weight:200;line-height:2.1428571435;color:inherit;background-color:#eee}.jumbotron h1{line-height:1;color:inherit}.jumbotron p{line-height:1.4}.container .jumbotron{border-radius:6px}@media screen and (min-width:768px){.jumbotron{padding-top:48px;padding-bottom:48px}.container .jumbotron{padding-right:60px;padding-left:60px}.jumbotron h1{font-size:63px}}.thumbnail{display:inline-block;display:block;height:auto;max-width:100%;padding:4px;margin-bottom:20px;line-height:1.428571429;background-color:#fff;border:1px solid #ddd;border-radius:
 4px;-webkit-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.thumbnail>img{display:block;height:auto;max-width:100%}a.thumbnail:hover,a.thumbnail:focus{border-color:#428bca}.thumbnail>img{margin-right:auto;margin-left:auto}.thumbnail .caption{padding:9px;color:#333}.alert{padding:15px;margin-bottom:20px;border:1px solid transparent;border-radius:4px}.alert h4{margin-top:0;color:inherit}.alert .alert-link{font-weight:bold}.alert>p,.alert>ul{margin-bottom:0}.alert>p+p{margin-top:5px}.alert-dismissable{padding-right:35px}.alert-dismissable .close{position:relative;top:-2px;right:-21px;color:inherit}.alert-success{color:#468847;background-color:#dff0d8;border-color:#d6e9c6}.alert-success hr{border-top-color:#c9e2b3}.alert-success .alert-link{color:#356635}.alert-info{color:#3a87ad;background-color:#d9edf7;border-color:#bce8f1}.alert-info hr{border-top-color:#a6e1ec}.alert-info .alert-link{color:#2d6987}.alert-warning{color:#c09853;background-color:#fcf8e3;border-color:#fbe
 ed5}.alert-warning hr{border-top-color:#f8e5be}.alert-warning .alert-link{color:#a47e3c}.alert-danger{color:#b94a48;background-color:#f2dede;border-color:#eed3d7}.alert-danger hr{border-top-color:#e6c1c7}.alert-danger .alert-link{color:#953b39}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-moz-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-o-keyframes progress-bar-stripes{from{background-position:0 0}to{background-position:40px 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}.progress{height:20px;margin-bottom:20px;overflow:hidden;background-color:#f5f5f5;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1)}.progress-bar{float:left;width:0;height:100%;font-size:12px;color:#fff;text-align:center;background-color:#428bca;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);box-shadow
 :inset 0 -1px 0 rgba(0,0,0,0.15);-webkit-transition:width .6s ease;transition:width .6s ease}.progress-striped .progress-bar{background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-size:40px 40px}.progress.act
 ive .progress-bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-moz-animation:progress-bar-stripes 2s linear infinite;-ms-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-bar-success{background-color:#5cb85c}.progress-striped .progress-bar-success{background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%
 ,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-bar-info{background-color:#5bc0de}.progress-striped .progress-bar-info{background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,2
 55,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-bar-warning{background-color:#f0ad4e}.progress-striped .progress-bar-warning{background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(
 255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-bar-danger{background-color:#d9534f}.progress-striped .progress-bar-danger{background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.media,.media-body{overflow:
 hidden;zoom:1}.media,.media .media{margin-top:15px}.media:first-child{margin-top:0}.media-object{display:block}.media-heading{margin:0 0 5px}.media>.pull-left{margin-right:10px}.media>.pull-right{margin-left:10px}.media-list{padding-left:0;list-style:none}.list-group{padding-left:0;margin-bottom:20px}.list-group-item{position:relative;display:block;padding:10px 15px;margin-bottom:-1px;background-color:#fff;border:1px solid #ddd}.list-group-item:first-child{border-top-right-radius:4px;border-top-left-radius:4px}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}.list-group-item>.badge{float:right}.list-group-item>.badge+.badge{margin-right:5px}a.list-group-item{color:#555}a.list-group-item .list-group-item-heading{color:#333}a.list-group-item:hover,a.list-group-item:focus{text-decoration:none;background-color:#f5f5f5}.list-group-item.active,.list-group-item.active:hover,.list-group-item.active:focus{z-index:2;color:#fff;background
 -color:#428bca;border-color:#428bca}.list-group-item.active .list-group-item-heading,.list-group-item.active:hover .list-group-item-heading,.list-group-item.active:focus .list-group-item-heading{color:inherit}.list-group-item.active .list-group-item-text,.list-group-item.active:hover .list-group-item-text,.list-group-item.active:focus .list-group-item-text{color:#e1edf7}.list-group-item-heading{margin-top:0;margin-bottom:5px}.list-group-item-text{margin-bottom:0;line-height:1.3}.panel{margin-bottom:20px;background-color:#fff;border:1px solid transparent;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,0.05);box-shadow:0 1px 1px rgba(0,0,0,0.05)}.panel-body{padding:15px}.panel-body:before,.panel-body:after{display:table;content:" "}.panel-body:after{clear:both}.panel-body:before,.panel-body:after{display:table;content:" "}.panel-body:after{clear:both}.panel>.list-group{margin-bottom:0}.panel>.list-group .list-group-item{border-width:1px 0}.panel>.list-group .list-group-item:
 first-child{border-top-right-radius:0;border-top-left-radius:0}.panel>.list-group .list-group-item:last-child{border-bottom:0}.panel-heading+.list-group .list-group-item:first-child{border-top-width:0}.panel>.table{margin-bottom:0}.panel>.panel-body+.table{border-top:1px solid #ddd}.panel-heading{padding:10px 15px;border-bottom:1px solid transparent;border-top-right-radius:3px;border-top-left-radius:3px}.panel-title{margin-top:0;margin-bottom:0;font-size:16px}.panel-title>a{color:inherit}.panel-footer{padding:10px 15px;background-color:#f5f5f5;border-top:1px solid #ddd;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel-group .panel{margin-bottom:0;overflow:hidden;border-radius:4px}.panel-group .panel+.panel{margin-top:5px}.panel-group .panel-heading{border-bottom:0}.panel-group .panel-heading+.panel-collapse .panel-body{border-top:1px solid #ddd}.panel-group .panel-footer{border-top:0}.panel-group .panel-footer+.panel-collapse .panel-body{border-bottom:1px solid #dd
 d}.panel-default{border-color:#ddd}.panel-default>.panel-heading{color:#333;background-color:#f5f5f5;border-color:#ddd}.panel-default>.panel-heading+.panel-collapse .panel-body{border-top-color:#ddd}.panel-default>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#ddd}.panel-primary{border-color:#428bca}.panel-primary>.panel-heading{color:#fff;background-color:#428bca;border-color:#428bca}.panel-primary>.panel-heading+.panel-collapse .panel-body{border-top-color:#428bca}.panel-primary>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#428bca}.panel-success{border-color:#d6e9c6}.panel-success>.panel-heading{color:#468847;background-color:#dff0d8;border-color:#d6e9c6}.panel-success>.panel-heading+.panel-collapse .panel-body{border-top-color:#d6e9c6}.panel-success>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#d6e9c6}.panel-warning{border-color:#fbeed5}.panel-warning>.panel-heading{color:#c09853;background-color:#fcf8e3;border-color:#fbeed5}.pane
 l-warning>.panel-heading+.panel-collapse .panel-body{border-top-color:#fbeed5}.panel-warning>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#fbeed5}.panel-danger{border-color:#eed3d7}.panel-danger>.panel-heading{color:#b94a48;background-color:#f2dede;border-color:#eed3d7}.panel-danger>.panel-heading+.panel-collapse .panel-body{border-top-color:#eed3d7}.panel-danger>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#eed3d7}.panel-info{border-color:#bce8f1}.panel-info>.panel-heading{color:#3a87ad;background-color:#d9edf7;border-color:#bce8f1}.panel-info>.panel-heading+.panel-collapse .panel-body{border-top-color:#bce8f1}.panel-info>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#bce8f1}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);box-shadow:inset 0 1px 1px rgba(0,0,0,0.05)}.well blockquote{border-color:#ddd;border-co
 lor:rgba(0,0,0,0.15)}.well-lg{padding:24px;border-radius:6px}.well-sm{padding:9px;border-radius:3px}.close{float:right;font-size:21px;font-weight:bold;line-height:1;color:#000;text-shadow:0 1px 0 #fff;opacity:.2;filter:alpha(opacity=20)}.close:hover,.close:focus{color:#000;text-decoration:none;cursor:pointer;opacity:.5;filter:alpha(opacity=50)}button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-appearance:none}.modal-open{overflow:hidden}body.modal-open,.modal-open .navbar-fixed-top,.modal-open .navbar-fixed-bottom{margin-right:15px}.modal{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;display:none;overflow:auto;overflow-y:scroll}.modal.fade .modal-dialog{-webkit-transform:translate(0,-25%);-ms-transform:translate(0,-25%);transform:translate(0,-25%);-webkit-transition:-webkit-transform .3s ease-out;-moz-transition:-moz-transform .3s ease-out;-o-transition:-o-transform .3s ease-out;transition:transform .3s ease-out}.modal.in .modal-dialog{-webkit-
 transform:translate(0,0);-ms-transform:translate(0,0);transform:translate(0,0)}.modal-dialog{z-index:1050;width:auto;padding:10px;margin-right:auto;margin-left:auto}.modal-content{position:relative;background-color:#fff;border:1px solid #999;border:1px solid rgba(0,0,0,0.2);border-radius:6px;outline:0;-webkit-box-shadow:0 3px 9px rgba(0,0,0,0.5);box-shadow:0 3px 9px rgba(0,0,0,0.5);background-clip:padding-box}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1030;background-color:#000}.modal-backdrop.fade{opacity:0;filter:alpha(opacity=0)}.modal-backdrop.in{opacity:.5;filter:alpha(opacity=50)}.modal-header{min-height:16.428571429px;padding:15px;border-bottom:1px solid #e5e5e5}.modal-header .close{margin-top:-2px}.modal-title{margin:0;line-height:1.428571429}.modal-body{position:relative;padding:20px}.modal-footer{padding:19px 20px 20px;margin-top:15px;text-align:right;border-top:1px solid #e5e5e5}.modal-footer:before,.modal-footer:after{display:table;content:" "}.
 modal-footer:after{clear:both}.modal-footer:before,.modal-footer:after{display:table;content:" "}.modal-footer:after{clear:both}.modal-footer .btn+.btn{margin-bottom:0;margin-left:5px}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}@media screen and (min-width:768px){.modal-dialog{right:auto;left:50%;width:600px;padding-top:30px;padding-bottom:30px}.modal-content{-webkit-box-shadow:0 5px 15px rgba(0,0,0,0.5);box-shadow:0 5px 15px rgba(0,0,0,0.5)}}.tooltip{position:absolute;z-index:1030;display:block;font-size:12px;line-height:1.4;opacity:0;filter:alpha(opacity=0);visibility:visible}.tooltip.in{opacity:.9;filter:alpha(opacity=90)}.tooltip.top{padding:5px 0;margin-top:-3px}.tooltip.right{padding:0 5px;margin-left:3px}.tooltip.bottom{padding:5px 0;margin-top:3px}.tooltip.left{padding:0 5px;margin-left:-3px}.tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:center;text-decoration:none;background-color:#000;border-ra
 dius:4px}.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-top-color:#000;border-width:5px 5px 0}.tooltip.top-left .tooltip-arrow{bottom:0;left:5px;border-top-color:#000;border-width:5px 5px 0}.tooltip.top-right .tooltip-arrow{right:5px;bottom:0;border-top-color:#000;border-width:5px 5px 0}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-right-color:#000;border-width:5px 5px 5px 0}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-left-color:#000;border-width:5px 0 5px 5px}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-bottom-color:#000;border-width:0 5px 5px}.tooltip.bottom-left .tooltip-arrow{top:0;left:5px;border-bottom-color:#000;border-width:0 5px 5px}.tooltip.bottom-right .tooltip-arrow{top:0;right:5px;border-bottom-color:#000;border-width:0 5px 5px}.popover{position:absolute;top:0;left:0;z-index:1010;displ
 ay:none;max-width:276px;padding:1px;text-align:left;white-space:normal;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2);background-clip:padding-box}.popover.top{margin-top:-10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-left:-10px}.popover-title{padding:8px 14px;margin:0;font-size:14px;font-weight:normal;line-height:18px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-radius:5px 5px 0 0}.popover-content{padding:9px 14px}.popover .arrow,.popover .arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.popover .arrow{border-width:11px}.popover .arrow:after{border-width:10px;content:""}.popover.top .arrow{bottom:-11px;left:50%;margin-left:-11px;border-top-color:#999;border-top-color:rgba(0,0,0,0.25);border-bottom-width:0}.popover.top .arrow:after{bott
 om:1px;margin-left:-10px;border-top-color:#fff;border-bottom-width:0;content:" "}.popover.right .arrow{top:50%;left:-11px;margin-top:-11px;border-right-color:#999;border-right-color:rgba(0,0,0,0.25);border-left-width:0}.popover.right .arrow:after{bottom:-10px;left:1px;border-right-color:#fff;border-left-width:0;content:" "}.popover.bottom .arrow{top:-11px;left:50%;margin-left:-11px;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,0.25);border-top-width:0}.popover.bottom .arrow:after{top:1px;margin-left:-10px;border-bottom-color:#fff;border-top-width:0;content:" "}.popover.left .arrow{top:50%;right:-11px;margin-top:-11px;border-left-color:#999;border-left-color:rgba(0,0,0,0.25);border-right-width:0}.popover.left .arrow:after{right:1px;bottom:-10px;border-left-color:#fff;border-right-width:0;content:" "}.carousel{position:relative}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel-inner>.item{position:relative;display:none;-webkit-transition:.6s ease-in-out 
 left;transition:.6s ease-in-out left}.carousel-inner>.item>img,.carousel-inner>.item>a>img{display:block;height:auto;max-width:100%;line-height:1}.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block}.carousel-inner>.active{left:0}.carousel-inner>.next,.carousel-inner>.prev{position:absolute;top:0;width:100%}.carousel-inner>.next{left:100%}.carousel-inner>.prev{left:-100%}.carousel-inner>.next.left,.carousel-inner>.prev.right{left:0}.carousel-inner>.active.left{left:-100%}.carousel-inner>.active.right{left:100%}.carousel-control{position:absolute;top:0;bottom:0;left:0;width:15%;font-size:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,0.6);opacity:.5;filter:alpha(opacity=50)}.carousel-control.left{background-image:-webkit-gradient(linear,0 top,100% top,from(rgba(0,0,0,0.5)),to(rgba(0,0,0,0.0001)));background-image:-webkit-linear-gradient(left,color-stop(rgba(0,0,0,0.5) 0),color-stop(rgba(0,0,0,0.0001) 100%));background-image:-moz-linear
 -gradient(left,rgba(0,0,0,0.5) 0,rgba(0,0,0,0.0001) 100%);background-image:linear-gradient(to right,rgba(0,0,0,0.5) 0,rgba(0,0,0,0.0001) 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000',endColorstr='#00000000',GradientType=1)}.carousel-control.right{right:0;left:auto;background-image:-webkit-gradient(linear,0 top,100% top,from(rgba(0,0,0,0.0001)),to(rgba(0,0,0,0.5)));background-image:-webkit-linear-gradient(left,color-stop(rgba(0,0,0,0.0001) 0),color-stop(rgba(0,0,0,0.5) 100%));background-image:-moz-linear-gradient(left,rgba(0,0,0,0.0001) 0,rgba(0,0,0,0.5) 100%);background-image:linear-gradient(to right,rgba(0,0,0,0.0001) 0,rgba(0,0,0,0.5) 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000',endColorstr='#80000000',GradientType=1)}.carousel-control:hover,.carousel-control:focus{color:#fff;text-decoration:none;opacity:.9;filter:alpha(opacity=90)}.carousel-control .icon-
 prev,.carousel-control .icon-next,.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right{position:absolute;top:50%;left:50%;z-index:5;display:inline-block}.carousel-control .icon-prev,.carousel-control .icon-next{width:20px;height:20px;margin-top:-10px;margin-left:-10px;font-family:serif}.c

<TRUNCATED>

[58/60] [abbrv] incubator-usergrid git commit: Adding Push Documentation

[sn...@apache.org]

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e5979feb/docs/rest-endpoints/api-docs.html
----------------------------------------------------------------------
diff --git a/docs/rest-endpoints/api-docs.html b/docs/rest-endpoints/api-docs.html
new file mode 100644
index 0000000..c8503d2
--- /dev/null
+++ b/docs/rest-endpoints/api-docs.html
@@ -0,0 +1,5273 @@
+<html>
+<head>
+    <title>Usergrid API Reference</title>
+    
+    <!-- Latest compiled and minified CSS -->
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css">
+    
+    <!-- Optional theme -->
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap-theme.min.css">
+
+    <link rel="stylesheet" href="api-docs.css">
+    
+</head>
+<body>
+
+<div class="row">
+    <div class="col-md-1"></div>
+    <div class="col-md-10">
+    
+    <h1>Usergrid API Reference</h1>
+    <p>Generated from Swagger.</p>
+<h2>Methods</h2><p>API methods are organized by the tags.</p>
+<p>Following the methods is a listing of all <a href='#models'>Default Entity Models.</p>
+<a name='Access-Tokens-method'></a>
+<h2>Access-Tokens</h2>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading POST">
+        <h2 class="panel-title POST-heading">POST /management/token 
+            <a data-toggle="collapse" data-target="#collapse-GBKFpoDUV6"
+                href="#collapse-GBKFpoDUV6" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-GBKFpoDUV6" class="panel-body collapse">
+
+        <p>Login with Admin-User or Organization credentials.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>login-credentials</b> (                    <a href="#logincredentials">LoginCredentials</a>) <br>
+                    Login credentials either username/password or id/secret. (Specified in body).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: Object containing access_token.</li>
+                        <li>Schema: [<a href="#accesstokenreponse">AccessTokenReponse</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading POST">
+        <h2 class="panel-title POST-heading">POST /{orgId}/{appId}/token 
+            <a data-toggle="collapse" data-target="#collapse-jf7rRaHshu"
+                href="#collapse-jf7rRaHshu" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-jf7rRaHshu" class="panel-body collapse">
+
+        <p>Login with App-User or Application credentials.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>login-credentials</b> (                    <a href="#logincredentials">LoginCredentials</a>) <br>
+                    Login credentials either username/password or id/secret. (Specified in body).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of new created Admin user&#39;s info.</li>
+                        <li>Schema: [<a href="#accesstokenreponse">AccessTokenReponse</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+<a name='Activities-method'></a>
+<h2>Activities</h2>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading GET">
+        <h2 class="panel-title GET-heading">GET /{orgId}/{appId}/groups/{groupId}/feed 
+            <a data-toggle="collapse" data-target="#collapse-2kebCfBv6r"
+                href="#collapse-2kebCfBv6r" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-2kebCfBv6r" class="panel-body collapse">
+
+        <p>Get a group&#39;s feed through providing all the identifications.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>appId</b> (string) <br>
+                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>groupId</b> (string) <br>
+                    One of the group&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of group&#39;s activity.</li>
+                        <li>Schema: [<a href="#activityfeed">ActivityFeed</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading POST">
+        <h2 class="panel-title POST-heading">POST /{orgId}/{appId}/users/{userId}/activities 
+            <a data-toggle="collapse" data-target="#collapse-eu3aLpfo9e"
+                href="#collapse-eu3aLpfo9e" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-eu3aLpfo9e" class="panel-body collapse">
+
+        <p>Create an activity in the activities collection.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>appId</b> (string) <br>
+                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>userId-3</b> (string) <br>
+                    One of the user&#39;s identification which includes username or UUID. (Specified in path).
+                </li>
+                <li>
+                    <b>CreateActivity</b> (                    <a href="#createactivity">CreateActivity</a>) <br>
+                    One or more sets of activity properties. (Specified in body).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of user&#39;s activity.</li>
+                        <li>Schema: [<a href="#activityfeed">ActivityFeed</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading GET">
+        <h2 class="panel-title GET-heading">GET /{orgId}/{appId}/users/{userId}/feed 
+            <a data-toggle="collapse" data-target="#collapse-av92cfV1L6"
+                href="#collapse-av92cfV1L6" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-av92cfV1L6" class="panel-body collapse">
+
+        <p>Retrieve a user&#39;s feed through providing all the identifications.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>appId</b> (string) <br>
+                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>userId-3</b> (string) <br>
+                    One of the user&#39;s identification which includes username or UUID. (Specified in path).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of user&#39;s activity feed.</li>
+                        <li>Schema: [<a href="#activityfeed">ActivityFeed</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+<a name='Admin-Users-method'></a>
+<h2>Admin-Users</h2>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading GET">
+        <h2 class="panel-title GET-heading">GET /management/orgs/{orgId}/users 
+            <a data-toggle="collapse" data-target="#collapse-INFXttZor5"
+                href="#collapse-INFXttZor5" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-INFXttZor5" class="panel-body collapse">
+
+        <p>Retrieve details about the admin users in an organization.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of retrieved Admin user&#39;s info.</li>
+                        <li>Schema: [<a href="#user">User</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading DELETE">
+        <h2 class="panel-title DELETE-heading">DELETE /management/orgs/{orgId}/users/{userId} 
+            <a data-toggle="collapse" data-target="#collapse-Gx6IFaXlzW"
+                href="#collapse-Gx6IFaXlzW" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-Gx6IFaXlzW" class="panel-body collapse">
+
+        <p>Remove an admin user from an organization through providing both Id of application and organization.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>userId-2</b> (string) <br>
+                    One of the user&#39;s identification which includes username, email address or UUID. (Specified in path).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of deleted Admin user&#39;s info.</li>
+                        <li>Schema: [<a href="#user">User</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading POST">
+        <h2 class="panel-title POST-heading">POST /management/users 
+            <a data-toggle="collapse" data-target="#collapse-Nl6a4Lig7S"
+                href="#collapse-Nl6a4Lig7S" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-Nl6a4Lig7S" class="panel-body collapse">
+
+        <p>Create a whole new admin user.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>adminuserproperty</b> (                    <a href="#createadminuser">CreateAdminUser</a>) <br>
+                    One or more sets of user properties of which username is mandatory and must be unique. (Specified in body).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of new created Admin user&#39;s info.</li>
+                        <li>Schema: [<a href="#user">User</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading GET">
+        <h2 class="panel-title GET-heading">GET /management/users/resetpw 
+            <a data-toggle="collapse" data-target="#collapse-4VO7rcVd5A"
+                href="#collapse-4VO7rcVd5A" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-4VO7rcVd5A" class="panel-body collapse">
+
+        <p>Initiate the reset of an admin user&#39;s password.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of complete messages.</li>
+                        <li>Schema: [<a href="#action">Action</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading POST">
+        <h2 class="panel-title POST-heading">POST /management/users/resetpw 
+            <a data-toggle="collapse" data-target="#collapse-LXqB2iYC97"
+                href="#collapse-LXqB2iYC97" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-LXqB2iYC97" class="panel-body collapse">
+
+        <p>Complete the password reset through getting the newpassword and the old one for identification.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>ResetPWMsg</b> (                    <a href="#resetpwmsg">ResetPWMsg</a>) <br>
+                    Parameters and value for the Captcha challenge, the admin user&#39;s response to the Captcha challenge, and the admin user&#39;s email address. (Specified in body).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of complete messages.</li>
+                        <li>Schema: [<a href="#action">Action</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading GET">
+        <h2 class="panel-title GET-heading">GET /management/users/{userId} 
+            <a data-toggle="collapse" data-target="#collapse-Q5z4TRg0Yz"
+                href="#collapse-Q5z4TRg0Yz" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-Q5z4TRg0Yz" class="panel-body collapse">
+
+        <p>Retrieve details about an admin user.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>userId</b> (string) <br>
+                    One of the user&#39;s identification which includes username, real name, email address or UUID. (Specified in path).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of user&#39;s details</li>
+                        <li>Schema: [<a href="#user">User</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading PUT">
+        <h2 class="panel-title PUT-heading">PUT /management/users/{userId} 
+            <a data-toggle="collapse" data-target="#collapse-RsksaP1nUc"
+                href="#collapse-RsksaP1nUc" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-RsksaP1nUc" class="panel-body collapse">
+
+        <p>Update the info of an admin user.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>userId</b> (string) <br>
+                    One of the user&#39;s identification which includes username, real name, email address or UUID. (Specified in path).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of user&#39;s details.</li>
+                        <li>Schema: [<a href="#user">User</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading GET">
+        <h2 class="panel-title GET-heading">GET /management/users/{userId}/activate 
+            <a data-toggle="collapse" data-target="#collapse-kEAq8Yg9t1"
+                href="#collapse-kEAq8Yg9t1" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-kEAq8Yg9t1" class="panel-body collapse">
+
+        <p>Activate an admin user from a link provIded in an email notification.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>userId</b> (string) <br>
+                    One of the user&#39;s identification which includes username, real name, email address or UUID. (Specified in path).
+                </li>
+                <li>
+                    <b>token</b> (string) <br>
+                    Activation token&#39;s query statement. (Specified in query).
+                </li>
+                <li>
+                    <b>confirm_email</b> (boolean) <br>
+                    Query statement of whether send confimation email or not. (Specified in query).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of complete messages.</li>
+                        <li>Schema: [<a href="#action">Action</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading PUT">
+        <h2 class="panel-title PUT-heading">PUT /management/users/{userId}/password 
+            <a data-toggle="collapse" data-target="#collapse-W5RltyqKY4"
+                href="#collapse-W5RltyqKY4" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-W5RltyqKY4" class="panel-body collapse">
+
+        <p>Update an admin user&#39;s password through getting the newpassword and the old one for identification.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>userId</b> (string) <br>
+                    One of the user&#39;s identification which includes username, real name, email address or UUID. (Specified in path).
+                </li>
+                <li>
+                    <b>ResetPW</b> (                    <a href="#resetpw">ResetPW</a>) <br>
+                    The user&#39;s old and new password. (Specified in body).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of complete messages.</li>
+                        <li>Schema: [<a href="#action">Action</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading GET">
+        <h2 class="panel-title GET-heading">GET /management/users/{userId}/reactivate 
+            <a data-toggle="collapse" data-target="#collapse-2Nlh69dhXA"
+                href="#collapse-2Nlh69dhXA" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-2Nlh69dhXA" class="panel-body collapse">
+
+        <p>Reactivate an expired admin user.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>userId</b> (string) <br>
+                    One of the user&#39;s identification which includes username, real name, email address or UUID. (Specified in path).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of complete messages.</li>
+                        <li>Schema: [<a href="#action">Action</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+<a name='App-Users-method'></a>
+<h2>App-Users</h2>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading GET">
+        <h2 class="panel-title GET-heading">GET /{orgId}/{appId}/users 
+            <a data-toggle="collapse" data-target="#collapse-tTTdu5vrV0"
+                href="#collapse-tTTdu5vrV0" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-tTTdu5vrV0" class="panel-body collapse">
+
+        <p>Retrieve users though query statement.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>appId</b> (string) <br>
+                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>queryStatement</b> (string) <br>
+                    The query statement of the User. (Specified in query).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of retrieved user&#39;s info.</li>
+                        <li>Schema: [<a href="#user">User</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading POST">
+        <h2 class="panel-title POST-heading">POST /{orgId}/{appId}/users 
+            <a data-toggle="collapse" data-target="#collapse-nPALd14DPA"
+                href="#collapse-nPALd14DPA" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-nPALd14DPA" class="panel-body collapse">
+
+        <p>Create a user in the users collection through providing all the identifications.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>appId</b> (string) <br>
+                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>CreateUser</b> (                    <a href="#createuser">CreateUser</a>) <br>
+                    The properties of the user. (Specified in body).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of created user&#39;s info.</li>
+                        <li>Schema: [<a href="#user">User</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading GET">
+        <h2 class="panel-title GET-heading">GET /{orgId}/{appId}/users/{userId} 
+            <a data-toggle="collapse" data-target="#collapse-XuAVNrdj2h"
+                href="#collapse-XuAVNrdj2h" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-XuAVNrdj2h" class="panel-body collapse">
+
+        <p>Retrieve a user through providing all the identifications.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>appId</b> (string) <br>
+                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>userId-2</b> (string) <br>
+                    One of the user&#39;s identification which includes username, email address or UUID. (Specified in path).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of retrieved user&#39;s info.</li>
+                        <li>Schema: [<a href="#user">User</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading PUT">
+        <h2 class="panel-title PUT-heading">PUT /{orgId}/{appId}/users/{userId} 
+            <a data-toggle="collapse" data-target="#collapse-C4qK1lk92I"
+                href="#collapse-C4qK1lk92I" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-C4qK1lk92I" class="panel-body collapse">
+
+        <p>Update a user through providing all the identifications.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>appId</b> (string) <br>
+                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>userId-3</b> (string) <br>
+                    One of the user&#39;s identification which includes username or UUID. (Specified in path).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of updated user&#39;s info.</li>
+                        <li>Schema: [<a href="#user">User</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading DELETE">
+        <h2 class="panel-title DELETE-heading">DELETE /{orgId}/{appId}/users/{userId} 
+            <a data-toggle="collapse" data-target="#collapse-0WSXcDOdUz"
+                href="#collapse-0WSXcDOdUz" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-0WSXcDOdUz" class="panel-body collapse">
+
+        <p>Remove a user through providing all the identifications.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>appId</b> (string) <br>
+                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>userId-3</b> (string) <br>
+                    One of the user&#39;s identification which includes username or UUID. (Specified in path).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of deleted user&#39;s info.</li>
+                        <li>Schema: [<a href="#user">User</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading POST">
+        <h2 class="panel-title POST-heading">POST /{orgId}/{appId}/users/{user}/password 
+            <a data-toggle="collapse" data-target="#collapse-r2XF5BGN70"
+                href="#collapse-r2XF5BGN70" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-r2XF5BGN70" class="panel-body collapse">
+
+        <p>Set a user&#39;s password or reset the user&#39;s existing password.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>appId</b> (string) <br>
+                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>username</b> (string) <br>
+                    The username of the user. (Specified in path).
+                </li>
+                <li>
+                    <b>ResetPW</b> (                    <a href="#resetpw">ResetPW</a>) <br>
+                    The user&#39;s old and new password. (Specified in body).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of complete messages.</li>
+                        <li>Schema: [<a href="#action">Action</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+<a name='Entities-Collections-method'></a>
+<h2>Entities-Collections</h2>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading GET">
+        <h2 class="panel-title GET-heading">GET /{orgId}/{appId}/users/{userId}/{relation} 
+            <a data-toggle="collapse" data-target="#collapse-3lNveRpUqE"
+                href="#collapse-3lNveRpUqE" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-3lNveRpUqE" class="panel-body collapse">
+
+        <p>Retrieve a user&#39;s collections or connections through query statement.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>appId</b> (string) <br>
+                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>userId-3</b> (string) <br>
+                    One of the user&#39;s identification which includes username or UUID. (Specified in path).
+                </li>
+                <li>
+                    <b>relation</b> (string) <br>
+                    The relation between user and collections. (Specified in path).
+                </li>
+                <li>
+                    <b>queryStatement</b> (string) <br>
+                    The query statement of the user. (Specified in query).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of user&#39;s collections info.</li>
+                        <li>Schema: [<a href="#entity">Entity</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading GET">
+        <h2 class="panel-title GET-heading">GET /{orgId}/{appId}/{collectionId} 
+            <a data-toggle="collapse" data-target="#collapse-ogbhoDjg4H"
+                href="#collapse-ogbhoDjg4H" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-ogbhoDjg4H" class="panel-body collapse">
+
+        <p>Retrieve collection through query statement.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>appId</b> (string) <br>
+                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>collectionId</b> (string) <br>
+                    One of the collection&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>queryStatement</b> (string) <br>
+                    Any values specified in the query statement should be enclosed in single-quotes. (Specified in query).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of retrieved collection&#39;s info.</li>
+                        <li>Schema: [<a href="#entity">Entity</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading PUT">
+        <h2 class="panel-title PUT-heading">PUT /{orgId}/{appId}/{collectionId} 
+            <a data-toggle="collapse" data-target="#collapse-6dJ6nCe32N"
+                href="#collapse-6dJ6nCe32N" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-6dJ6nCe32N" class="panel-body collapse">
+
+        <p>Update collection through query statement.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>appId</b> (string) <br>
+                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>collectionId</b> (string) <br>
+                    One of the collection&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>queryStatement</b> (string) <br>
+                    Any values specified in the query statement should be enclosed in single-quotes. (Specified in query).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of updated collection&#39;s info.</li>
+                        <li>Schema: [<a href="#entity">Entity</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading POST">
+        <h2 class="panel-title POST-heading">POST /{orgId}/{appId}/{collectionId}/{entityId1}/{relation}/{entityId2} 
+            <a data-toggle="collapse" data-target="#collapse-CjwReqwJ3H"
+                href="#collapse-CjwReqwJ3H" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-CjwReqwJ3H" class="panel-body collapse">
+
+        <p>Add an entity to a collection through providing all the identifications.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>appId</b> (string) <br>
+                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>collectionId</b> (string) <br>
+                    One of the collection&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>entityId1</b> (string) <br>
+                    The Id of the 1st entity. (Specified in path).
+                </li>
+                <li>
+                    <b>relation</b> (string) <br>
+                    The relation between 1st entity and 2nd entity. (Specified in path).
+                </li>
+                <li>
+                    <b>entityId2</b> (string) <br>
+                    The Id of the 2nd entity. (Specified in path).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of added entity&#39;s info.</li>
+                        <li>Schema: [<a href="#entity">Entity</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading DELETE">
+        <h2 class="panel-title DELETE-heading">DELETE /{orgId}/{appId}/{collectionId}/{entityId1}/{relation}/{entityId2} 
+            <a data-toggle="collapse" data-target="#collapse-mafYwtUKyr"
+                href="#collapse-mafYwtUKyr" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-mafYwtUKyr" class="panel-body collapse">
+
+        <p>Remove an entity from a collection through providing all the identifications.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>appId</b> (string) <br>
+                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>collectionId</b> (string) <br>
+                    One of the collection&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>entityId1</b> (string) <br>
+                    The Id of the 1st entity. (Specified in path).
+                </li>
+                <li>
+                    <b>relation</b> (string) <br>
+                    The relation between 1st entity and 2nd entity. (Specified in path).
+                </li>
+                <li>
+                    <b>entityId2</b> (string) <br>
+                    The Id of the 2nd entity. (Specified in path).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of deleted entity&#39;s info.</li>
+                        <li>Schema: [<a href="#entity">Entity</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading GET">
+        <h2 class="panel-title GET-heading">GET /{orgId}/{appId}/{collectionId}/{entityId} 
+            <a data-toggle="collapse" data-target="#collapse-Flwr684SUK"
+                href="#collapse-Flwr684SUK" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-Flwr684SUK" class="panel-body collapse">
+
+        <p>Retrieve an entity through providing Id of application, organization, collection and entity.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>appId</b> (string) <br>
+                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>collectionId</b> (string) <br>
+                    One of the collection&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>entityId</b> (string) <br>
+                    One of the entity&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of retrieved entity&#39;s info.</li>
+                        <li>Schema: [<a href="#entity">Entity</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading PUT">
+        <h2 class="panel-title PUT-heading">PUT /{orgId}/{appId}/{collectionId}/{entityId} 
+            <a data-toggle="collapse" data-target="#collapse-JxsN5odke0"
+                href="#collapse-JxsN5odke0" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-JxsN5odke0" class="panel-body collapse">
+
+        <p>One or more properties can be updated with a single request.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>appId</b> (string) <br>
+                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>collectionId</b> (string) <br>
+                    One of the collection&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>entityId</b> (string) <br>
+                    One of the entity&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>entityproperty</b> (                    <a href="#createentities">CreateEntities</a>) <br>
+                    The properties of the entity. (Specified in body).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of updated entity&#39;s info.</li>
+                        <li>Schema: [<a href="#entity">Entity</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading DELETE">
+        <h2 class="panel-title DELETE-heading">DELETE /{orgId}/{appId}/{collectionId}/{entityId} 
+            <a data-toggle="collapse" data-target="#collapse-JBJI86ZdNr"
+                href="#collapse-JBJI86ZdNr" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-JBJI86ZdNr" class="panel-body collapse">
+
+        <p>Delete an entity from the collection.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>appId</b> (string) <br>
+                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>collectionId</b> (string) <br>
+                    One of the collection&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>entityId</b> (string) <br>
+                    One of the entity&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of deleted entity&#39;s info.</li>
+                        <li>Schema: [<a href="#entity">Entity</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading POST">
+        <h2 class="panel-title POST-heading">POST /{orgId}/{appId}/{entitytype} 
+            <a data-toggle="collapse" data-target="#collapse-aTXoq2rK1l"
+                href="#collapse-aTXoq2rK1l" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-aTXoq2rK1l" class="panel-body collapse">
+
+        <p>When a new entity is created, Usergrid will automatically create a corresponding collection if one does not already exist. The collection will automatically be named with the plural form of the entity type. </p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>appId</b> (string) <br>
+                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>entitytype</b> (string) <br>
+                    The entity type to create. (Specified in path).
+                </li>
+                <li>
+                    <b>entityproperty</b> (                    <a href="#createentities">CreateEntities</a>) <br>
+                    The properties of the entity. (Specified in body).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of created custom entity&#39;s info.</li>
+                        <li>Schema: [<a href="#entity">Entity</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+<a name='Events-method'></a>
+<h2>Events</h2>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading POST">
+        <h2 class="panel-title POST-heading">POST /{orgId}/{appId}/events 
+            <a data-toggle="collapse" data-target="#collapse-Ye4oYQGILh"
+                href="#collapse-Ye4oYQGILh" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-Ye4oYQGILh" class="panel-body collapse">
+
+        <p>Create an event through providing both Id of organization and application.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>appId</b> (string) <br>
+                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>CreateEvent</b> (                    <a href="#createevent">CreateEvent</a>) <br>
+                    The required property of the event. (Specified in body).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of created event&#39;s info.</li>
+                        <li>Schema: [<a href="#event">Event</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+<a name='Groups-method'></a>
+<h2>Groups</h2>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading POST">
+        <h2 class="panel-title POST-heading">POST /{orgId}/{appId}/groups 
+            <a data-toggle="collapse" data-target="#collapse-6zG2I9WKNb"
+                href="#collapse-6zG2I9WKNb" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-6zG2I9WKNb" class="panel-body collapse">
+
+        <p>Create a new group through providing both Id of organization and application.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>appId</b> (string) <br>
+                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>groupproperty</b> (                    <a href="#creategroup">CreateGroup</a>) <br>
+                    The property of the created group. (Specified in body).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of created group&#39;s info.</li>
+                        <li>Schema: [<a href="#group">Group</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading POST">
+        <h2 class="panel-title POST-heading">POST /{orgId}/{appId}/groups/{groupId}/activities 
+            <a data-toggle="collapse" data-target="#collapse-Jc4I3aTW16"
+                href="#collapse-Jc4I3aTW16" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-Jc4I3aTW16" class="panel-body collapse">
+
+        <p>Create an activity to a specific group. In this case the activity is created in the activities collection and is accessible at the /activities endpoint to users who have the permission to read that endpoint. In addition, a relationship is established between the activity and the group, and because of that, the activity will appear in the group’s feed. The group &#39;owns&#39; the activity. Also, the activity will be published in the feed of all users that are members of the group.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>appId</b> (string) <br>
+                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>groupId</b> (string) <br>
+                    One of the group&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>CreateActivity</b> (                    <a href="#createactivity">CreateActivity</a>) <br>
+                    One or more sets of activity properties. (Specified in body).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of user&#39;s activity.</li>
+                        <li>Schema: [<a href="#activityfeed">ActivityFeed</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading POST">
+        <h2 class="panel-title POST-heading">POST /{orgId}/{appId}/groups/{groupId}/users/{userId} 
+            <a data-toggle="collapse" data-target="#collapse-DSJUff0PNr"
+                href="#collapse-DSJUff0PNr" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-DSJUff0PNr" class="panel-body collapse">
+
+        <p>Add a user to a group through providing all the identifications.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>appId</b> (string) <br>
+                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>groupId</b> (string) <br>
+                    One of the group&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>userId-3</b> (string) <br>
+                    One of the user&#39;s identification which includes username or UUID. (Specified in path).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of added user&#39;s info.</li>
+                        <li>Schema: [<a href="#user">User</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading DELETE">
+        <h2 class="panel-title DELETE-heading">DELETE /{orgId}/{appId}/groups/{groupId}/users/{userId} 
+            <a data-toggle="collapse" data-target="#collapse-51z524RgVx"
+                href="#collapse-51z524RgVx" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-51z524RgVx" class="panel-body collapse">
+
+        <p>Delete user from a group through providing all the identifications.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>appId</b> (string) <br>
+                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>groupId</b> (string) <br>
+                    One of the group&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>userId-3</b> (string) <br>
+                    One of the user&#39;s identification which includes username or UUID. (Specified in path).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of deleted user&#39;s info.</li>
+                        <li>Schema: [<a href="#user">User</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading GET">
+        <h2 class="panel-title GET-heading">GET /{org_Id}/{app_Id}/groups/{groupId} 
+            <a data-toggle="collapse" data-target="#collapse-KlZpilr6UK"
+                href="#collapse-KlZpilr6UK" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-KlZpilr6UK" class="panel-body collapse">
+
+        <p>Get a group through through providing all the identifications.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>appId</b> (string) <br>
+                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>groupId</b> (string) <br>
+                    One of the group&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of retrieved group&#39;s info.</li>
+                        <li>Schema: [<a href="#group">Group</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading PUT">
+        <h2 class="panel-title PUT-heading">PUT /{org_Id}/{app_Id}/groups/{groupId} 
+            <a data-toggle="collapse" data-target="#collapse-BXLQOcewyG"
+                href="#collapse-BXLQOcewyG" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-BXLQOcewyG" class="panel-body collapse">
+
+        <p>Update a group through providing all the identifications.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>appId</b> (string) <br>
+                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>groupId</b> (string) <br>
+                    One of the group&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of updated group&#39;s info.</li>
+                        <li>Schema: [<a href="#group">Group</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+<a name='Organizations-Applications-method'></a>
+<h2>Organizations-Applications</h2>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading POST">
+        <h2 class="panel-title POST-heading">POST /management/orgs 
+            <a data-toggle="collapse" data-target="#collapse-wzwEPlWx3I"
+                href="#collapse-wzwEPlWx3I" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-wzwEPlWx3I" class="panel-body collapse">
+
+        <p>Create an organization through a form post.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>CreateOrg</b> (                    <a href="#createorg">CreateOrg</a>) <br>
+                    A set of organization properties supplied through a form. (Specified in body).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of created Organization.</li>
+                        <li>Schema: [<a href="#organization">Organization</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading GET">
+        <h2 class="panel-title GET-heading">GET /management/orgs/{orgId} 
+            <a data-toggle="collapse" data-target="#collapse-slpUppvXYt"
+                href="#collapse-slpUppvXYt" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-slpUppvXYt" class="panel-body collapse">
+
+        <p>Retrieve an organization given a specified UUID or username.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of created Organization.</li>
+                        <li>Schema: [<a href="#organization">Organization</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading GET">
+        <h2 class="panel-title GET-heading">GET /management/orgs/{orgId}/activate 
+            <a data-toggle="collapse" data-target="#collapse-UQVPZkh37l"
+                href="#collapse-UQVPZkh37l" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-UQVPZkh37l" class="panel-body collapse">
+
+        <p>Activate an organization from a link provIded in an email notification.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>token</b> (string) <br>
+                    Activation token. (Specified in query).
+                </li>
+                <li>
+                    <b>confirm_email</b> (boolean) <br>
+                    Send confirmation email or not. (Specified in query).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of complete messages.</li>
+                        <li>Schema: [<a href="#action">Action</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading GET">
+        <h2 class="panel-title GET-heading">GET /management/orgs/{orgId}/apps 
+            <a data-toggle="collapse" data-target="#collapse-8LGuCrnbKW"
+                href="#collapse-8LGuCrnbKW" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-8LGuCrnbKW" class="panel-body collapse">
+
+        <p>Retrieve the applications in an organization through providing both Id of application and organization.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of retrieved application data.</li>
+                        <li>Schema: [<a href="#appdata">AppData</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading GET">
+        <h2 class="panel-title GET-heading">GET /management/orgs/{orgId}/apps/{appId}/credentials 
+            <a data-toggle="collapse" data-target="#collapse-dztEZmu1g1"
+                href="#collapse-dztEZmu1g1" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-dztEZmu1g1" class="panel-body collapse">
+
+        <p>Retrieve the client Id and client secret credentials for an application in an organization.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>appId</b> (string) <br>
+                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of retrieved credentials info.</li>
+                        <li>Schema: [<a href="#credential">Credential</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading POST">
+        <h2 class="panel-title POST-heading">POST /management/orgs/{orgId}/apps/{appId}/credentials 
+            <a data-toggle="collapse" data-target="#collapse-XAQ9lJMHjV"
+                href="#collapse-XAQ9lJMHjV" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-XAQ9lJMHjV" class="panel-body collapse">
+
+        <p>Generate the client Id and client secret credentials for an application in an organization.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>appId</b> (string) <br>
+                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of generated credentials info.</li>
+                        <li>Schema: [<a href="#credential">Credential</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading GET">
+        <h2 class="panel-title GET-heading">GET /management/orgs/{orgId}/credentials 
+            <a data-toggle="collapse" data-target="#collapse-FvRT5w6yPs"
+                href="#collapse-FvRT5w6yPs" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-FvRT5w6yPs" class="panel-body collapse">
+
+        <p>Retrieve the credentials for an organization client.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of Credential</li>
+                        <li>Schema: [<a href="#credential">Credential</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading POST">
+        <h2 class="panel-title POST-heading">POST /management/orgs/{orgId}/credentials 
+            <a data-toggle="collapse" data-target="#collapse-Kyg8FZRwpG"
+                href="#collapse-Kyg8FZRwpG" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-Kyg8FZRwpG" class="panel-body collapse">
+
+        <p>Generate whole new credentials for an organization client.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of Credential</li>
+                        <li>Schema: [<a href="#credential">Credential</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading GET">
+        <h2 class="panel-title GET-heading">GET /management/orgs/{orgId}/feed 
+            <a data-toggle="collapse" data-target="#collapse-DbjlZueEYM"
+                href="#collapse-DbjlZueEYM" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-DbjlZueEYM" class="panel-body collapse">
+
+        <p>Retrieve an organization&#39;s activity feed.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of the organization&#39;s ActivityFeed.</li>
+                        <li>Schema: [<a href="#activityfeed">ActivityFeed</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading GET">
+        <h2 class="panel-title GET-heading">GET /management/orgs/{orgId}/reactivate 
+            <a data-toggle="collapse" data-target="#collapse-AoDIMg5c5y"
+                href="#collapse-AoDIMg5c5y" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-AoDIMg5c5y" class="panel-body collapse">
+
+        <p>Reactivate an expired organization.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of complete messages.</li>
+                        <li>Schema: [<a href="#action">Action</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading GET">
+        <h2 class="panel-title GET-heading">GET /management/users/{userId}/feed 
+            <a data-toggle="collapse" data-target="#collapse-o7DRWYIH05"
+                href="#collapse-o7DRWYIH05" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-o7DRWYIH05" class="panel-body collapse">
+
+        <p>Retrieve an admin user&#39;s activity feed.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>userId</b> (string) <br>
+                    One of the user&#39;s identification which includes username, real name, email address or UUID. (Specified in path).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of user&#39;s activity</li>
+                        <li>Schema: [<a href="#activityfeed">ActivityFeed</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+<a name='Permissions-Roles-method'></a>
+<h2>Permissions-Roles</h2>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading GET">
+        <h2 class="panel-title GET-heading">GET /{orgId}/{appId}/roles 
+           

<TRUNCATED>

[21/60] [abbrv] incubator-usergrid git commit: cherry picking docs from master

[sn...@apache.org]

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/data-storage/entities.html
----------------------------------------------------------------------
diff --git a/content/docs/data-storage/entities.html b/content/docs/data-storage/entities.html
new file mode 100644
index 0000000..be4531f
--- /dev/null
+++ b/content/docs/data-storage/entities.html
@@ -0,0 +1,1014 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>Entities &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+        <link rel="next" title="Querying your data" href="../data-queries/querying-your-data.html"/>
+        <link rel="prev" title="Collections" href="collections.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="collections.html">Collections</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">Entities</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#creating-custom-data-entities">Creating Custom Data Entities</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#creating-a-custom-entity">Creating a custom entity</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#request-syntax">Request Syntax</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#example-request-response">Example Request/Response</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#creating-multiple-custom-entities">Creating multiple custom entities</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#id1">Request Syntax</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id2">Example Request/Response</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#creating-an-entity-with-sub-properties">Creating an entity with sub-properties</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#updating-sub-properties">Updating sub-properties</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#retrieving-data-entities">Retrieving Data Entities</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#retrieving-an-entity">Retrieving an entity</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id3">Request Syntax</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id4">Example Request/Response</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#retrieving-multiple-entities">Retrieving multiple entities</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id5">Request Syntax</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id6">Example Request/Response</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#updating-data-entities">Updating Data Entities</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#updating-an-entity">Updating an entity</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id7">Request Syntax</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id8">Example Request/Response</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#updating-a-sub-property">Updating a sub-property</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id9">Request Syntax</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id10">Example Request/Response</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#deleting-data-entities">Deleting Data Entities</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#deleting-an-entity">Deleting an entity</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id11">Request Syntax</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id12">Example Request/Response</a></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>Entities</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/data-storage/entities.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="entities">
+<h1>Entities<a class="headerlink" href="#entities" title="Permalink to this headline">¶</a></h1>
+<div class="section" id="creating-custom-data-entities">
+<h2>Creating Custom Data Entities<a class="headerlink" href="#creating-custom-data-entities" title="Permalink to this headline">¶</a></h2>
+<p>This article describes how to create custom data entities and entity
+properties. Entity types correspond to the name of collection to which
+they are posted. For example, if you create a new custom &#8220;dog&#8221; entity, a
+&#8220;dogs&#8221; collection will be created if one did not already exist. If a
+&#8220;dogs&#8221; collection already exists, the new &#8220;dog&#8221; entity will be saved in
+it. All user-defined properties are indexed, and strings that contain
+multiple words are keyword-indexed.</p>
+<p>The methods cited in this article should be used to create custom data
+entities. If you are using one of the Usergrid SDKs, use one of the
+entity type-specific SDK methods to create default data entities.</p>
+<p><strong>Note</strong>: Although not shown in the API examples below, you need to
+provide a valid access token with each API call. See Authenticating
+users and application clients for details.</p>
+<div class="section" id="creating-a-custom-entity">
+<h3>Creating a custom entity<a class="headerlink" href="#creating-a-custom-entity" title="Permalink to this headline">¶</a></h3>
+<p>When a new entity is created, Usergrid will automatically create a
+corresponding collection if one does not already exist. The collection
+will automatically be named with the plural form of the entity type. For
+example, creating a custom entity of type &#8216;item&#8217; will automatically
+create a collection named &#8216;items&#8217; in which all future &#8216;item&#8217; entities
+will be saved.</p>
+</div>
+<div class="section" id="request-syntax">
+<h3>Request Syntax<a class="headerlink" href="#request-syntax" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X POST https://api.usergrid.com/&lt;org&gt;/&lt;app&gt;/&lt;entity_type&gt; -d &#39;json_object&#39;
+</pre></div>
+</div>
+<p>Parameters</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="27%" />
+<col width="73%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>org</td>
+<td>Organization UUID or organization name</td>
+</tr>
+<tr class="row-odd"><td>app</td>
+<td>Application UUID or application name</td>
+</tr>
+<tr class="row-even"><td>entity_type</td>
+<td>Entity type to create.</td>
+</tr>
+<tr class="row-odd"><td>json_object</td>
+<td>JSON representation of entity properties</td>
+</tr>
+</tbody>
+</table>
+<p>(For a full list of default properties, see Default Data Entity Types)</p>
+<p>Usergrid will create a corresponding collection if one does not already
+exist. To add an entity to an existing collections, use the pluralized
+collection name for entity_type.</p>
+</div>
+<div class="section" id="example-request-response">
+<h3>Example Request/Response<a class="headerlink" href="#example-request-response" title="Permalink to this headline">¶</a></h3>
+<p>Request:</p>
+<div class="highlight-python"><div class="highlight"><pre>curl -X POST &quot;https://api.usergrid.com/your-org/your-app/item&quot; -d &#39;{&quot;name&quot;:&quot;milk&quot;, &quot;price&quot;:&quot;3.25&quot;}&#39;
+</pre></div>
+</div>
+<p>Response:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+    <span class="s">&quot;action&quot;</span> <span class="p">:</span> <span class="s">&quot;post&quot;</span><span class="p">,</span>
+    <span class="s">&quot;application&quot;</span> <span class="p">:</span> <span class="s">&quot;4a1edb70-d7a8-11e2-9ce3-f315e5aa568a&quot;</span><span class="p">,</span>
+    <span class="s">&quot;params&quot;</span> <span class="p">:</span> <span class="p">{</span> <span class="p">},</span>
+    <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span class="s">&quot;/items&quot;</span><span class="p">,</span> <span class="s">&quot;uri&quot;</span> <span class="p">:</span> <span class="s">&quot;http://api.usergrid.com/my-org/my-app/items&quot;</span><span class="p">,</span>
+    <span class="s">&quot;entities&quot;</span> <span class="p">:</span> <span class="p">[</span> <span class="p">{</span>
+        <span class="s">&quot;uuid&quot;</span> <span class="p">:</span> <span class="s">&quot;83e9b7ea-e8f5-11e2-84df-e94123890c7a&quot;</span><span class="p">,</span>
+        <span class="s">&quot;type&quot;</span> <span class="p">:</span> <span class="s">&quot;item&quot;</span><span class="p">,</span>
+        <span class="s">&quot;name&quot;</span> <span class="p">:</span> <span class="s">&quot;milk&quot;</span><span class="p">,</span>
+        <span class="s">&quot;created&quot;</span> <span class="p">:</span> <span class="mi">1373415195230</span><span class="p">,</span>
+        <span class="s">&quot;modified&quot;</span> <span class="p">:</span> <span class="mi">1373415195230</span><span class="p">,</span>
+        <span class="s">&quot;metadata&quot;</span> <span class="p">:</span> <span class="p">{</span>
+
+            <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span class="s">&quot;/items/83e9b7ea-e8f5-11e2-84df-e94123890c7a&quot;</span>
+        <span class="p">},</span>
+        <span class="s">&quot;name&quot;</span> <span class="p">:</span> <span class="s">&quot;milk&quot;</span><span class="p">,</span>
+        <span class="s">&quot;price&quot;</span> <span class="p">:</span> <span class="s">&quot;3.25&quot;</span>
+    <span class="p">}</span> <span class="p">],</span>
+    <span class="s">&quot;timestamp&quot;</span> <span class="p">:</span> <span class="mi">1373415195225</span><span class="p">,</span>
+    <span class="s">&quot;duration&quot;</span> <span class="p">:</span> <span class="mi">635</span><span class="p">,</span>
+    <span class="s">&quot;organization&quot;</span> <span class="p">:</span> <span class="s">&quot;my-org&quot;</span><span class="p">,</span>
+    <span class="s">&quot;applicationName&quot;</span> <span class="p">:</span> <span class="s">&quot;my-app&quot;</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+</div>
+<div class="section" id="creating-multiple-custom-entities">
+<h2>Creating multiple custom entities<a class="headerlink" href="#creating-multiple-custom-entities" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="id1">
+<h3>Request Syntax<a class="headerlink" href="#id1" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X POST https://api.usergrid.com/&lt;org&gt;/&lt;app&gt;/&lt;entity_type&gt;/ -d &#39;json_array&#39;
+</pre></div>
+</div>
+<p>Parameters</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="28%" />
+<col width="72%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>org</td>
+<td>Organization UUID or name</td>
+</tr>
+<tr class="row-odd"><td>app</td>
+<td>Application UUID or name</td>
+</tr>
+<tr class="row-even"><td>entity_type</td>
+<td>Custom entity type to create.</td>
+</tr>
+<tr class="row-odd"><td>json_array</td>
+<td>JSON array of entities to be created.</td>
+</tr>
+</tbody>
+</table>
+<p>Usergrid will create a corresponding collection if one does not already
+exist. To add an entity to an existing collections, use the collection
+name or collection UUID in place of the entity type.</p>
+</div>
+<div class="section" id="id2">
+<h3>Example Request/Response<a class="headerlink" href="#id2" title="Permalink to this headline">¶</a></h3>
+<p>Request:</p>
+<div class="highlight-python"><div class="highlight"><pre>curl -X POST &quot;https://api.usergrid.com/your-org/your-app/item&quot; -d &#39;[{&quot;name&quot;:&quot;milk&quot;, &quot;price&quot;:&quot;3.25&quot;}, {&quot;name&quot;:&quot;bread&quot;, &quot;price&quot;:&quot;2.50&quot;}]&#39;
+</pre></div>
+</div>
+<p>Response:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+    <span class="s">&quot;action&quot;</span> <span class="p">:</span> <span class="s">&quot;post&quot;</span><span class="p">,</span>
+    <span class="s">&quot;application&quot;</span> <span class="p">:</span> <span class="s">&quot;f34f4222-a166-11e2-a7f7-02e9sjwsf3d0&quot;</span><span class="p">,</span>
+    <span class="s">&quot;params&quot;</span> <span class="p">:</span> <span class="p">{</span> <span class="p">},</span>
+    <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span class="s">&quot;/items&quot;</span><span class="p">,</span>
+    <span class="s">&quot;uri&quot;</span> <span class="p">:</span> <span class="s">&quot;http://api.usergrid.com/your-org/your-app/items&quot;</span><span class="p">,</span>
+    <span class="s">&quot;entities&quot;</span> <span class="p">:</span> <span class="p">[</span> <span class="p">{</span>
+        <span class="s">&quot;uuid&quot;</span> <span class="p">:</span> <span class="s">&quot;f3a8061a-ef0b-11e2-9e92-5f4a65c16193&quot;</span><span class="p">,</span>
+        <span class="s">&quot;type&quot;</span> <span class="p">:</span> <span class="s">&quot;item&quot;</span><span class="p">,</span>
+        <span class="s">&quot;name&quot;</span> <span class="p">:</span> <span class="s">&quot;milk&quot;</span><span class="p">,</span>
+        <span class="s">&quot;price&quot;</span> <span class="p">:</span> <span class="s">&quot;3.25&quot;</span><span class="p">,</span>
+        <span class="s">&quot;created&quot;</span> <span class="p">:</span> <span class="mi">1374084538609</span><span class="p">,</span>
+        <span class="s">&quot;modified&quot;</span> <span class="p">:</span> <span class="mi">1374084538609</span><span class="p">,</span>
+        <span class="s">&quot;metadata&quot;</span> <span class="p">:</span> <span class="p">{</span>
+            <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span class="s">&quot;/multis/f3a8061a-ef0b-11e2-9e92-5f4a65c16193&quot;</span>
+        <span class="p">},</span>
+        <span class="s">&quot;name&quot;</span> <span class="p">:</span> <span class="s">&quot;milk&quot;</span>
+    <span class="p">},</span> <span class="p">{</span>
+        <span class="s">&quot;uuid&quot;</span> <span class="p">:</span> <span class="s">&quot;f3be262a-ef0b-11e2-a51b-6715d5ef47a6&quot;</span><span class="p">,</span>
+        <span class="s">&quot;type&quot;</span> <span class="p">:</span> <span class="s">&quot;item&quot;</span><span class="p">,</span>
+        <span class="s">&quot;name&quot;</span> <span class="p">:</span> <span class="s">&quot;bread&quot;</span><span class="p">,</span>
+        <span class="s">&quot;price&quot;</span> <span class="p">:</span> <span class="s">&quot;2.50&quot;</span><span class="p">,</span>
+        <span class="s">&quot;created&quot;</span> <span class="p">:</span> <span class="mi">1374084538754</span><span class="p">,</span>
+        <span class="s">&quot;modified&quot;</span> <span class="p">:</span> <span class="mi">1374084538754</span><span class="p">,</span>
+        <span class="s">&quot;metadata&quot;</span> <span class="p">:</span> <span class="p">{</span>
+            <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span class="s">&quot;/items/f3be262a-ef0b-11e2-a51b-6715d5ef47a6&quot;</span>
+        <span class="p">},</span>
+        <span class="s">&quot;name&quot;</span> <span class="p">:</span> <span class="s">&quot;bread&quot;</span>
+    <span class="p">}</span> <span class="p">],</span>
+    <span class="s">&quot;timestamp&quot;</span> <span class="p">:</span> <span class="mi">1374084538584</span><span class="p">,</span>
+    <span class="s">&quot;duration&quot;</span> <span class="p">:</span> <span class="mi">388</span><span class="p">,</span>
+    <span class="s">&quot;organization&quot;</span> <span class="p">:</span> <span class="s">&quot;your-org&quot;</span><span class="p">,</span>
+    <span class="s">&quot;applicationName&quot;</span> <span class="p">:</span> <span class="s">&quot;your-app&quot;</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="creating-an-entity-with-sub-properties">
+<h3>Creating an entity with sub-properties<a class="headerlink" href="#creating-an-entity-with-sub-properties" title="Permalink to this headline">¶</a></h3>
+<p>Any valid JSON object can be stored in an entity, regardless of the
+level of complexity, including sub-properties. For example, suppose you
+have an &#8216;items&#8217; collection that contains an entity named &#8216;milk&#8217;. You
+might store the different varieties of milk as sub-properties of a
+&#8216;varieties&#8217; property:</p>
+<div class="highlight-python"><div class="highlight"><pre>{
+    &quot;type&quot; : &quot;item&quot;
+    &quot;name&quot; : &quot;milk&quot;
+    &quot;varieties&quot; : [ {
+        &quot;name&quot; : &quot;1%&quot;,
+        &quot;price&quot; : &quot;3.25&quot;,
+        &quot;sku&quot; : &quot;0393847575533445&quot;
+    }, {
+        &quot;name&quot; : &quot;whole&quot;,
+        &quot;price&quot; : &quot;3.85&quot;,
+        &quot;sku&quot; : &quot;0393394956788445&quot;
+    }, {
+        &quot;name&quot; : &quot;skim&quot;,
+        &quot;price&quot; : &quot;4.00&quot;,
+        &quot;sku&quot; : &quot;0390299933488445&quot;
+    } ]
+}
+</pre></div>
+</div>
+</div>
+<div class="section" id="updating-sub-properties">
+<h3>Updating sub-properties<a class="headerlink" href="#updating-sub-properties" title="Permalink to this headline">¶</a></h3>
+<p>An array of sub-properties is treated as a single object. This means
+that sub-properties cannot be updated atomically. All sub-properties of
+a given property must be updated as a set. For more on updating an
+existing sub-property, see Updating Data Entities.</p>
+<p>Example Request/Response</p>
+<div class="highlight-python"><div class="highlight"><pre>Request:
+//Note the use of square brackets for specifying multiple nested objects
+curl -X POST &quot;https://api.usergrid.com/your-org/your-app/items&quot; -d &#39;{&quot;varieties&quot;:[{&quot;name&quot;:&quot;1%&quot;,&quot;price&quot; : &quot;3.25&quot;, &quot;sku&quot; : &quot;0393847575533445&quot;},{&quot;name&quot; : &quot;whole&quot;, &quot;price&quot; : &quot;3.85&quot;, &quot;sku&quot; : &quot;0393394956788445&quot;}, {&quot;name&quot; : &quot;skim&quot;, &quot;price&quot; : &quot;4.00&quot;, &quot;sku&quot; : &quot;0390299933488445&quot;}]}&#39;
+Response:
+{
+    &quot;action&quot; : &quot;post&quot;,
+    &quot;application&quot; : &quot;f34f4222-a166-11e2-a7f7-02e81adcf3d0&quot;,
+    &quot;params&quot; : { },
+    &quot;path&quot; : &quot;/items&quot;,
+    &quot;uri&quot; : &quot;http://api.usergrid.com/your-org/your-app/items&quot;,
+    &quot;entities&quot; : [ {
+        &quot;uuid&quot; : &quot;0d7cf92a-effb-11e2-917d-c5e707256e71&quot;,
+        &quot;type&quot; : &quot;item&quot;,
+        &quot;name&quot; : &quot;milk&quot;,
+        &quot;created&quot; : 1374187231666,
+        &quot;modified&quot; : 1374187231666,
+        &quot;metadata&quot; : {
+            &quot;path&quot; : &quot;/items/0d7cf92a-effb-11e2-917d-c5e707256e71&quot;
+        },
+        &quot;name&quot; : &quot;milk&quot;,
+        &quot;varieties&quot; : [ {
+            &quot;name&quot; : &quot;1%&quot;,
+            &quot;price&quot; : &quot;3.25&quot;,
+            &quot;SKU&quot; : &quot;0393847575533445&quot;
+        }, {
+            &quot;name&quot; : &quot;whole&quot;,
+            &quot;price&quot; : &quot;3.85&quot;,
+            &quot;SKU&quot; : &quot;0393394956788445&quot;
+        }, {
+            &quot;name&quot; : &quot;skim&quot;,
+            &quot;price&quot; : &quot;4.00&quot;,
+            &quot;SKU&quot; : &quot;0390299933488445&quot;
+        } ]
+    } ],
+    &quot;timestamp&quot; : 1374187450826,
+    &quot;duration&quot; : 50,
+    &quot;organization&quot; : &quot;your-org&quot;,
+    &quot;applicationName&quot; : &quot;your-app&quot;
+}
+</pre></div>
+</div>
+</div>
+</div>
+<hr class="docutils" />
+<div class="section" id="retrieving-data-entities">
+<h2>Retrieving Data Entities<a class="headerlink" href="#retrieving-data-entities" title="Permalink to this headline">¶</a></h2>
+<p>This article describes how to retrieve entities from your account.</p>
+<p><strong>Note</strong>: Although not shown in the API examples below, you need to
+provide a valid access token with each API call. See Authenticating
+users and application clients for details.</p>
+<p>With the exception of the user entity, all data entities can be
+retrieved by using their UUID or a &#8216;name&#8217; property. The user entity can
+be retrieved by UUID or the &#8216;username&#8217; property. The value for the
+&#8216;name&#8217; or &#8216;username&#8217; property must be unique.</p>
+<div class="section" id="retrieving-an-entity">
+<h3>Retrieving an entity<a class="headerlink" href="#retrieving-an-entity" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="id3">
+<h3>Request Syntax<a class="headerlink" href="#id3" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X GET https://api.usergrid.com/&lt;org&gt;/&lt;app&gt;/&lt;collection&gt;/&lt;entity&gt;
+</pre></div>
+</div>
+<p>Parameters</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="25%" />
+<col width="75%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>org</td>
+<td>Organization UUID or organization name</td>
+</tr>
+<tr class="row-odd"><td>app</td>
+<td>Application UUID or application name</td>
+</tr>
+<tr class="row-even"><td>collection</td>
+<td>Collection UUID or collection name</td>
+</tr>
+<tr class="row-odd"><td>entity</td>
+<td>Entity UUID or entity name</td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="section" id="id4">
+<h3>Example Request/Response<a class="headerlink" href="#id4" title="Permalink to this headline">¶</a></h3>
+<p>Request:</p>
+<p>Retrieve by UUID:</p>
+<div class="highlight-python"><div class="highlight"><pre>curl -X GET &quot;https://api.usergrid.com/your-org/your-app/items/da4a50dc-38dc-11e2-b2e4-02e81adcf3d0&quot;
+</pre></div>
+</div>
+<p>Retrieve by &#8216;name&#8217; property:</p>
+<div class="highlight-python"><div class="highlight"><pre>curl -X GET &quot;https://api.usergrid.com/your-org/your-app/items/milk&quot;
+</pre></div>
+</div>
+<p>Response:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+    <span class="s">&quot;action&quot;</span> <span class="p">:</span> <span class="s">&quot;get&quot;</span><span class="p">,</span>
+    <span class="s">&quot;application&quot;</span> <span class="p">:</span> <span class="s">&quot;f34f4222-a166-11e2-a7f7-02e81adcf3d0&quot;</span><span class="p">,</span>
+    <span class="s">&quot;params&quot;</span> <span class="p">:</span> <span class="p">{</span> <span class="p">},</span>
+    <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span class="s">&quot;/items&quot;</span><span class="p">,</span>
+    <span class="s">&quot;uri&quot;</span> <span class="p">:</span> <span class="s">&quot;http://api.usergrid.com/amuramoto/sandbox/items&quot;</span><span class="p">,</span>
+    <span class="s">&quot;entities&quot;</span> <span class="p">:</span> <span class="p">[</span> <span class="p">{</span>
+        <span class="s">&quot;uuid&quot;</span> <span class="p">:</span> <span class="s">&quot;5bb76bca-1657-11e3-903f-9ff6c621a7a4&quot;</span><span class="p">,</span>
+        <span class="s">&quot;type&quot;</span> <span class="p">:</span> <span class="s">&quot;item&quot;</span><span class="p">,</span>
+        <span class="s">&quot;name&quot;</span> <span class="p">:</span> <span class="s">&quot;milk&quot;</span><span class="p">,</span>
+        <span class="s">&quot;created&quot;</span> <span class="p">:</span> <span class="mi">1378405020796</span><span class="p">,</span>
+        <span class="s">&quot;modified&quot;</span> <span class="p">:</span> <span class="mi">1378405020796</span><span class="p">,</span>
+        <span class="s">&quot;metadata&quot;</span> <span class="p">:</span> <span class="p">{</span>
+              <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span class="s">&quot;/items/5bb76bca-1657-11e3-903f-9ff6c621a7a4&quot;</span>
+        <span class="p">},</span>
+        <span class="s">&quot;name&quot;</span> <span class="p">:</span> <span class="s">&quot;milk&quot;</span><span class="p">,</span>
+        <span class="s">&quot;price&quot;</span> <span class="p">:</span> <span class="s">&quot;3.25&quot;</span>
+    <span class="p">}</span> <span class="p">],</span>
+    <span class="s">&quot;timestamp&quot;</span> <span class="p">:</span> <span class="mi">1378405025763</span><span class="p">,</span>
+    <span class="s">&quot;duration&quot;</span> <span class="p">:</span> <span class="mi">31</span><span class="p">,</span>
+    <span class="s">&quot;organization&quot;</span> <span class="p">:</span> <span class="s">&quot;amuramoto&quot;</span><span class="p">,</span>
+    <span class="s">&quot;applicationName&quot;</span> <span class="p">:</span> <span class="s">&quot;sandbox&quot;</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="retrieving-multiple-entities">
+<h3>Retrieving multiple entities<a class="headerlink" href="#retrieving-multiple-entities" title="Permalink to this headline">¶</a></h3>
+<p>This example describes how to retrieve multiple entities by UUID. You
+can also retrieve a set of entities by using a query string. For more
+information on querying your data, see Querying your data.</p>
+</div>
+<div class="section" id="id5">
+<h3>Request Syntax<a class="headerlink" href="#id5" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X GET https://api.usergrid.com/&lt;org_id&gt;/&lt;app_id&gt;/&lt;collection&gt;?ql= uuid = &lt;entity_uuid&gt; OR uuid = &lt;entity_uuid&gt;; ...
+</pre></div>
+</div>
+<p>Parameters</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="18%" />
+<col width="83%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>org_id</td>
+<td>Organization UUID or organization name</td>
+</tr>
+<tr class="row-odd"><td>app_id</td>
+<td>Application UUID or application name</td>
+</tr>
+<tr class="row-even"><td>collection</td>
+<td>Collection UUID or collection name</td>
+</tr>
+<tr class="row-odd"><td>query</td>
+<td>A url-encoded query string of entity properties to be matched.</td>
+</tr>
+</tbody>
+</table>
+<p>The query must be in Usergrid Query Language, for example:</p>
+<div class="highlight-python"><div class="highlight"><pre>?ql=uuid=&quot;&lt;entity_uuid&gt;&quot;&quot; OR name=&quot;&lt;entity_name&gt;&quot; OR...
+</pre></div>
+</div>
+<p>You may also specify the following for certain entity types:</p>
+<p>User entities: username =</p>
+<p>All other entities except groups: name =</p>
+</div>
+<div class="section" id="id6">
+<h3>Example Request/Response<a class="headerlink" href="#id6" title="Permalink to this headline">¶</a></h3>
+<p>Request:</p>
+<div class="highlight-python"><div class="highlight"><pre>//note the url-encoded query string
+curl -X GET &quot;https://api.usergrid.com/your-org/your-app/items?ql=name%3D&#39;milk&#39;%20OR%20UUID%3D1a9356ba-1682-11e3-a72a-81581bbaf055&amp;limit=&quot;
+</pre></div>
+</div>
+<p>Note: The query parameter of the request must be url encoded for curl
+requests</p>
+<p>Response:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+      <span class="s">&quot;action&quot;</span> <span class="p">:</span> <span class="s">&quot;get&quot;</span><span class="p">,</span>
+      <span class="s">&quot;application&quot;</span> <span class="p">:</span> <span class="s">&quot;f34f4222-a166-11e2-a7f7-02e81adcf3d0&quot;</span><span class="p">,</span>
+      <span class="s">&quot;params&quot;</span> <span class="p">:</span> <span class="p">{</span>
+            <span class="s">&quot;ql&quot;</span> <span class="p">:</span> <span class="p">[</span> <span class="s">&quot;name=&#39;milk&#39; OR UUID=1a9356ba-1682-11e3-a72a-81581bbaf055&quot;</span> <span class="p">]</span>
+      <span class="p">},</span>
+      <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span class="s">&quot;/items&quot;</span><span class="p">,</span>
+      <span class="s">&quot;uri&quot;</span> <span class="p">:</span> <span class="s">&quot;http://api.usergrid.com/your-org/your-app/items&quot;</span><span class="p">,</span>
+      <span class="s">&quot;entities&quot;</span> <span class="p">:</span> <span class="p">[</span> <span class="p">{</span>
+            <span class="s">&quot;uuid&quot;</span> <span class="p">:</span> <span class="s">&quot;5bb76bca-1657-11e3-903f-9ff6c621a7a4&quot;</span><span class="p">,</span>
+            <span class="s">&quot;type&quot;</span> <span class="p">:</span> <span class="s">&quot;item&quot;</span><span class="p">,</span>
+            <span class="s">&quot;name&quot;</span> <span class="p">:</span> <span class="s">&quot;milk&quot;</span><span class="p">,</span>
+            <span class="s">&quot;created&quot;</span> <span class="p">:</span> <span class="mi">1378405020796</span><span class="p">,</span>
+            <span class="s">&quot;modified&quot;</span> <span class="p">:</span> <span class="mi">1378405020796</span><span class="p">,</span>
+            <span class="s">&quot;metadata&quot;</span> <span class="p">:</span> <span class="p">{</span>
+                  <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span class="s">&quot;/items/5bb76bca-1657-11e3-903f-9ff6c621a7a4&quot;</span>
+        <span class="p">},</span>
+            <span class="s">&quot;name&quot;</span> <span class="p">:</span> <span class="s">&quot;milk&quot;</span><span class="p">,</span>
+            <span class="s">&quot;price&quot;</span> <span class="p">:</span> <span class="s">&quot;3.25&quot;</span>
+      <span class="p">},</span> <span class="p">{</span>
+        <span class="s">&quot;uuid&quot;</span> <span class="p">:</span> <span class="s">&quot;1a9356ba-1682-11e3-a72a-81581bbaf055&quot;</span><span class="p">,</span>
+        <span class="s">&quot;type&quot;</span> <span class="p">:</span> <span class="s">&quot;item&quot;</span><span class="p">,</span>
+        <span class="s">&quot;name&quot;</span> <span class="p">:</span> <span class="s">&quot;bread&quot;</span><span class="p">,</span>
+        <span class="s">&quot;created&quot;</span> <span class="p">:</span> <span class="mi">1378423379867</span><span class="p">,</span>
+        <span class="s">&quot;modified&quot;</span> <span class="p">:</span> <span class="mi">1378423379867</span><span class="p">,</span>
+        <span class="s">&quot;metadata&quot;</span> <span class="p">:</span> <span class="p">{</span>
+              <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span class="s">&quot;/items/1a9356ba-1682-11e3-a72a-81581bbaf055&quot;</span>
+        <span class="p">},</span>
+            <span class="s">&quot;name&quot;</span> <span class="p">:</span> <span class="s">&quot;bread&quot;</span><span class="p">,</span>
+            <span class="s">&quot;price&quot;</span> <span class="p">:</span> <span class="s">&quot;2.50&quot;</span>
+      <span class="p">}</span> <span class="p">],</span>
+      <span class="s">&quot;timestamp&quot;</span> <span class="p">:</span> <span class="mi">1378423793729</span><span class="p">,</span>
+      <span class="s">&quot;duration&quot;</span> <span class="p">:</span> <span class="mi">63</span><span class="p">,</span>
+      <span class="s">&quot;organization&quot;</span> <span class="p">:</span> <span class="s">&quot;your-org&quot;</span><span class="p">,</span>
+      <span class="s">&quot;applicationName&quot;</span> <span class="p">:</span> <span class="s">&quot;your-app&quot;</span><span class="p">,</span>
+      <span class="s">&quot;count&quot;</span> <span class="p">:</span> <span class="mi">2</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+</div>
+<hr class="docutils" />
+<div class="section" id="updating-data-entities">
+<h2>Updating Data Entities<a class="headerlink" href="#updating-data-entities" title="Permalink to this headline">¶</a></h2>
+<p>This article describes how to update entities in your account.</p>
+<p><strong>Note</strong>: Although not shown in the API examples below, you need to
+provide a valid access token with each API call. See Authenticating
+users and application clients for details.</p>
+<div class="section" id="updating-an-entity">
+<h3>Updating an entity<a class="headerlink" href="#updating-an-entity" title="Permalink to this headline">¶</a></h3>
+<p>One or more properties can be updated with a single PUT request. For
+information on updating sub-properties, see Updating sub-properties
+below.</p>
+</div>
+<div class="section" id="id7">
+<h3>Request Syntax<a class="headerlink" href="#id7" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X PUT https://api.usergrid.com/&lt;org&gt;/&lt;app&gt;/&lt;collection&gt;/&lt;entity&gt; -d {&lt;property&gt;}
+</pre></div>
+</div>
+<p>Parameters</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="21%" />
+<col width="79%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>org_id</td>
+<td>Organization UUID or organization name</td>
+</tr>
+<tr class="row-odd"><td>app_id</td>
+<td>Application UUID or application name</td>
+</tr>
+<tr class="row-even"><td>collection</td>
+<td>Name of the collection containing the entity to be updated</td>
+</tr>
+<tr class="row-odd"><td>uuid|name</td>
+<td>UUID or name of the data entity to be updated</td>
+</tr>
+<tr class="row-even"><td>json_object</td>
+<td>JSON object with a field for each property to be updated</td>
+</tr>
+</tbody>
+</table>
+<p>An entity property to be updated, formatted as a key-value pair. For
+example:</p>
+<div class="highlight-python"><div class="highlight"><pre>{&quot;property_1&quot;:&quot;value_1&quot;, &quot;property_2&quot;:&quot;value_2&quot;,...}
+</pre></div>
+</div>
+</div>
+<div class="section" id="id8">
+<h3>Example Request/Response<a class="headerlink" href="#id8" title="Permalink to this headline">¶</a></h3>
+<p>Request:</p>
+<div class="highlight-python"><div class="highlight"><pre>curl -X PUT https://api.usergrid.com/your-org/your-app/items/milk -d &#39;{&quot;price&quot;:&quot;4.00&quot;, &quot;availability&quot;:&quot;in-stock&quot;}&#39;
+</pre></div>
+</div>
+<p>Response:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+  <span class="s">&quot;action&quot;</span> <span class="p">:</span> <span class="s">&quot;put&quot;</span><span class="p">,</span>
+  <span class="s">&quot;application&quot;</span> <span class="p">:</span> <span class="s">&quot;f34f4222-a166-11e2-a7f7-02e81adcf3d0&quot;</span><span class="p">,</span>
+  <span class="s">&quot;params&quot;</span> <span class="p">:</span> <span class="p">{</span> <span class="p">},</span>
+  <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span class="s">&quot;/items&quot;</span><span class="p">,</span>
+  <span class="s">&quot;uri&quot;</span> <span class="p">:</span> <span class="s">&quot;http://api.usergrid.com/your-org/your-app/items&quot;</span><span class="p">,</span>
+  <span class="s">&quot;entities&quot;</span> <span class="p">:</span> <span class="p">[</span> <span class="p">{</span>
+    <span class="s">&quot;uuid&quot;</span> <span class="p">:</span> <span class="s">&quot;5bb76bca-1657-11e3-903f-9ff6c621a7a4&quot;</span><span class="p">,</span>
+    <span class="s">&quot;type&quot;</span> <span class="p">:</span> <span class="s">&quot;item&quot;</span><span class="p">,</span>
+    <span class="s">&quot;name&quot;</span> <span class="p">:</span> <span class="s">&quot;milk&quot;</span><span class="p">,</span>
+    <span class="s">&quot;created&quot;</span> <span class="p">:</span> <span class="mi">1378405020796</span><span class="p">,</span>
+    <span class="s">&quot;modified&quot;</span> <span class="p">:</span> <span class="mi">1378505705077</span><span class="p">,</span>
+    <span class="s">&quot;availability&quot;</span> <span class="p">:</span> <span class="s">&quot;in-stock&quot;</span><span class="p">,</span>
+    <span class="s">&quot;metadata&quot;</span> <span class="p">:</span> <span class="p">{</span>
+      <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span class="s">&quot;/items/5bb76bca-1657-11e3-903f-9ff6c621a7a4&quot;</span>
+    <span class="p">},</span>
+    <span class="s">&quot;name&quot;</span> <span class="p">:</span> <span class="s">&quot;milk&quot;</span><span class="p">,</span>
+    <span class="s">&quot;price&quot;</span> <span class="p">:</span> <span class="s">&quot;4.00&quot;</span>
+  <span class="p">}</span> <span class="p">],</span>
+  <span class="s">&quot;timestamp&quot;</span> <span class="p">:</span> <span class="mi">1378505705050</span><span class="p">,</span>
+  <span class="s">&quot;duration&quot;</span> <span class="p">:</span> <span class="mi">87</span><span class="p">,</span>
+  <span class="s">&quot;organization&quot;</span> <span class="p">:</span> <span class="s">&quot;your-org&quot;</span><span class="p">,</span>
+  <span class="s">&quot;applicationName&quot;</span> <span class="p">:</span> <span class="s">&quot;your-app&quot;</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="updating-a-sub-property">
+<h3>Updating a sub-property<a class="headerlink" href="#updating-a-sub-property" title="Permalink to this headline">¶</a></h3>
+<p>Data entities may contain sets of sub-properties as nested JSON objects.
+Unlike normal entity properties, however, sub-properties cannot be
+updated individually. Updating a nested object will cause all
+sub-properties within it to be overwritten.</p>
+<p>For example, if you have a data entity with the following nested object:</p>
+</div>
+<div class="section" id="id9">
+<h3>Request Syntax<a class="headerlink" href="#id9" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X PUT https://api.usergrid.com/&lt;org_id&gt;/&lt;app_id&gt;/&lt;collection&gt;/&lt;uuid|name&gt; -d &#39;{&lt;property&gt; : [{&lt;sub_property&gt;}, {&lt;sub_property&gt;}...]}&#39;
+</pre></div>
+</div>
+<p>Parameters</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="21%" />
+<col width="79%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>org_id</td>
+<td>Organization UUID or organization name</td>
+</tr>
+<tr class="row-odd"><td>app_id</td>
+<td>Application UUID or application name</td>
+</tr>
+<tr class="row-even"><td>collection</td>
+<td>Name of the collection containing the entity to be updated</td>
+</tr>
+<tr class="row-odd"><td>uuid|name</td>
+<td>UUID or name of the data entity to be updated</td>
+</tr>
+<tr class="row-even"><td>json_object</td>
+<td>JSON object with a field for each property to be updated</td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="section" id="id10">
+<h3>Example Request/Response<a class="headerlink" href="#id10" title="Permalink to this headline">¶</a></h3>
+<p>Request:</p>
+<div class="highlight-python"><div class="highlight"><pre>curl -X PUT https://api.usergrid.com/your-org/your-app/items/milk -d &#39;{&quot;varieties&quot;:[{&quot;name&quot;:&quot;1%&quot;,&quot;price&quot;:&quot;3.25&quot;},{&quot;name&quot;:&quot;whole&quot;,&quot;price&quot;:&quot;4.00&quot;}]}&#39;
+</pre></div>
+</div>
+<p>Response:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+  <span class="s">&quot;action&quot;</span> <span class="p">:</span> <span class="s">&quot;put&quot;</span><span class="p">,</span>
+  <span class="s">&quot;application&quot;</span> <span class="p">:</span> <span class="s">&quot;f34f4222-a166-11e2-a7f7-02e81adcf3d0&quot;</span><span class="p">,</span>
+  <span class="s">&quot;params&quot;</span> <span class="p">:</span> <span class="p">{</span> <span class="p">},</span>
+  <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span class="s">&quot;/items&quot;</span><span class="p">,</span>
+  <span class="s">&quot;uri&quot;</span> <span class="p">:</span> <span class="s">&quot;http://api.usergrid.com/your-org/your-app/items&quot;</span><span class="p">,</span>
+  <span class="s">&quot;entities&quot;</span> <span class="p">:</span> <span class="p">[</span> <span class="p">{</span>
+    <span class="s">&quot;uuid&quot;</span> <span class="p">:</span> <span class="s">&quot;5bb76bca-1657-11e3-903f-9ff6c621a7a4&quot;</span><span class="p">,</span>
+    <span class="s">&quot;type&quot;</span> <span class="p">:</span> <span class="s">&quot;item&quot;</span><span class="p">,</span>
+    <span class="s">&quot;name&quot;</span> <span class="p">:</span> <span class="s">&quot;milk&quot;</span><span class="p">,</span>
+    <span class="s">&quot;created&quot;</span> <span class="p">:</span> <span class="mi">1378405020796</span><span class="p">,</span>
+    <span class="s">&quot;modified&quot;</span> <span class="p">:</span> <span class="mi">1378761459069</span><span class="p">,</span>
+    <span class="s">&quot;availability&quot;</span> <span class="p">:</span> <span class="s">&quot;in-stock&quot;</span><span class="p">,</span>
+    <span class="s">&quot;metadata&quot;</span> <span class="p">:</span> <span class="p">{</span>
+      <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span class="s">&quot;/items/5bb76bca-1657-11e3-903f-9ff6c621a7a4&quot;</span>
+    <span class="p">},</span>
+    <span class="s">&quot;name&quot;</span> <span class="p">:</span> <span class="s">&quot;milk&quot;</span><span class="p">,</span>
+    <span class="s">&quot;uri&quot;</span> <span class="p">:</span> <span class="s">&quot;http://api.usergrid.com/your-org/your-app/items/5bb76bca-1657-11e3-903f-9ff6c621a7a4&quot;</span><span class="p">,</span>
+    <span class="s">&quot;varieties&quot;</span> <span class="p">:</span> <span class="p">[</span> <span class="p">{</span>
+      <span class="s">&quot;name&quot;</span> <span class="p">:</span> <span class="s">&quot;1%&quot;</span><span class="p">,</span>
+      <span class="s">&quot;price&quot;</span> <span class="p">:</span> <span class="s">&quot;3.25&quot;</span>
+    <span class="p">},</span> <span class="p">{</span>
+      <span class="s">&quot;name&quot;</span> <span class="p">:</span> <span class="s">&quot;whole&quot;</span><span class="p">,</span>
+      <span class="s">&quot;price&quot;</span> <span class="p">:</span> <span class="s">&quot;4.00&quot;</span>
+    <span class="p">}</span> <span class="p">]</span>
+  <span class="p">}</span> <span class="p">],</span>
+  <span class="s">&quot;timestamp&quot;</span> <span class="p">:</span> <span class="mi">1378761459047</span><span class="p">,</span>
+  <span class="s">&quot;duration&quot;</span> <span class="p">:</span> <span class="mi">62</span><span class="p">,</span>
+  <span class="s">&quot;organization&quot;</span> <span class="p">:</span> <span class="s">&quot;your-org&quot;</span><span class="p">,</span>
+  <span class="s">&quot;applicationName&quot;</span> <span class="p">:</span> <span class="s">&quot;your-app&quot;</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+</div>
+<div class="section" id="deleting-data-entities">
+<h2>Deleting Data Entities<a class="headerlink" href="#deleting-data-entities" title="Permalink to this headline">¶</a></h2>
+<p>This article describes how to delete data entities.</p>
+<p><strong>Note</strong>:Although not shown in the API examples below, you need to
+provide a valid access token with each API call. See Authenticating
+users and application clients for details.</p>
+<div class="section" id="deleting-an-entity">
+<h3>Deleting an entity<a class="headerlink" href="#deleting-an-entity" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="id11">
+<h3>Request Syntax<a class="headerlink" href="#id11" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X DELETE https://api.usergrid.com/&lt;org&gt;/&lt;app&gt;/&lt;collection&gt;/&lt;entity&gt;
+</pre></div>
+</div>
+<p>Parameters</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="25%" />
+<col width="75%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>org</td>
+<td>Organization UUID or organization name</td>
+</tr>
+<tr class="row-odd"><td>app</td>
+<td>Application UUID or application name</td>
+</tr>
+<tr class="row-even"><td>collection</td>
+<td>Collection UUID or collection name</td>
+</tr>
+<tr class="row-odd"><td>entity</td>
+<td>Entity UUID or entity name</td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="section" id="id12">
+<h3>Example Request/Response<a class="headerlink" href="#id12" title="Permalink to this headline">¶</a></h3>
+<p>Request:</p>
+<p>Delete by UUID:</p>
+<div class="highlight-python"><div class="highlight"><pre>curl -X DELETE &quot;https://api.usergrid.com/your-org/your-app/items/da4a50dc-38dc-11e2-b2e4-02e81adcf3d0&quot;
+</pre></div>
+</div>
+<p>Delete by &#8216;name&#8217; property:</p>
+<div class="highlight-python"><div class="highlight"><pre>curl -X DELETE &quot;https://api.usergrid.com/your-org/your-app/items/milk&quot;
+</pre></div>
+</div>
+<p>Response:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+  <span class="s">&quot;action&quot;</span> <span class="p">:</span> <span class="s">&quot;delete&quot;</span><span class="p">,</span>
+  <span class="s">&quot;application&quot;</span> <span class="p">:</span> <span class="s">&quot;f34f4222-a166-11e2-a7f7-02e81adcf3d0&quot;</span><span class="p">,</span>
+  <span class="s">&quot;params&quot;</span> <span class="p">:</span> <span class="p">{</span> <span class="p">},</span>
+  <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span class="s">&quot;/items&quot;</span><span class="p">,</span>
+  <span class="s">&quot;uri&quot;</span> <span class="p">:</span> <span class="s">&quot;http://api.usergrid.com/your-org/your-app/items&quot;</span><span class="p">,</span>
+  <span class="s">&quot;entities&quot;</span> <span class="p">:</span> <span class="p">[</span> <span class="p">{</span>
+    <span class="s">&quot;uuid&quot;</span> <span class="p">:</span> <span class="s">&quot;328fe64a-19a0-11e3-8a2a-ebc6f49d1fc4&quot;</span><span class="p">,</span>
+    <span class="s">&quot;type&quot;</span> <span class="p">:</span> <span class="s">&quot;item&quot;</span><span class="p">,</span>
+    <span class="s">&quot;name&quot;</span> <span class="p">:</span> <span class="s">&quot;milk&quot;</span><span class="p">,</span>
+    <span class="s">&quot;created&quot;</span> <span class="p">:</span> <span class="mi">1378766158500</span><span class="p">,</span>
+    <span class="s">&quot;modified&quot;</span> <span class="p">:</span> <span class="mi">1378766158500</span><span class="p">,</span>
+    <span class="s">&quot;metadata&quot;</span> <span class="p">:</span> <span class="p">{</span>
+      <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span class="s">&quot;/items/328fe64a-19a0-11e3-8a2a-ebc6f49d1fc4&quot;</span>
+    <span class="p">},</span>
+    <span class="s">&quot;name&quot;</span> <span class="p">:</span> <span class="s">&quot;milk&quot;</span><span class="p">,</span>
+    <span class="s">&quot;price&quot;</span> <span class="p">:</span> <span class="s">&quot;3.25&quot;</span>
+  <span class="p">}</span> <span class="p">],</span>
+  <span class="s">&quot;timestamp&quot;</span> <span class="p">:</span> <span class="mi">1378766172016</span><span class="p">,</span>
+  <span class="s">&quot;duration&quot;</span> <span class="p">:</span> <span class="mi">324</span><span class="p">,</span>
+  <span class="s">&quot;organization&quot;</span> <span class="p">:</span> <span class="s">&quot;your-org&quot;</span><span class="p">,</span>
+  <span class="s">&quot;applicationName&quot;</span> <span class="p">:</span> <span class="s">&quot;your-app&quot;</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+</div>
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+      
+        <a href="../data-queries/querying-your-data.html" class="btn btn-neutral float-right" title="Querying your data" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+      
+      
+        <a href="collections.html" class="btn btn-neutral" title="Collections" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+      
+    </div>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

[34/60] [abbrv] incubator-usergrid git commit: cherry picking docs from master

[sn...@apache.org]

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/security-and-auth/authenticating-api-requests.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/security-and-auth/authenticating-api-requests.txt b/content/docs/_sources/security-and-auth/authenticating-api-requests.txt
new file mode 100644
index 0000000..af52bf6
--- /dev/null
+++ b/content/docs/_sources/security-and-auth/authenticating-api-requests.txt
@@ -0,0 +1,38 @@
+# Authenticating API requests
+
+With the exception of the 'sandbox' application that is created with every Usergrid organization, all applications are secured by default. This means that to access your data store, a valid access token must be sent with all API requests to authenticate that the requester is authorized to make API calls to the resources they are attempting the access.
+
+This article describes how to use access tokens to access the Usergrid API, and how to manage access tokens, including revoking and changing token time to live.
+
+For information on generating access tokens/authenticating users and clients, see Authenticating users and application clients.
+
+## Authenticating with access tokens
+When you obtain an access token, you must provide it with every subsequent API call that you make. There are two ways to provide your access token.
+
+You can add the token to the API query string:
+
+    https://<usergrid-host>/{org-name}/{app-name}/users?access_token={access_token}
+    
+You can include the token in an HTTP authorization header:
+
+    Authorization: Bearer {access_token}
+
+<div class="admonition note"> <p class="first admonition-title">Note</p> <p class="last">

+Note: The Usergrid documentation assumes you are providing a valid access token with every API call whether or not it is shown explicitly in the examples. Unless the documentation specifically says that you can access an API endpoint without an access token, you should assume that you must provide it. One application that does not require an access token is the sandbox application. The Guest role has been given full permissions (/** for GET, POST, PUT, and DELETE) for this application. This eliminates the need for a token when making application level calls to the sandbox app. For further information on specifying permissions, see Managing access by defining permission rules.
+</p></div>
+
+## Authenticating with client ID and client secret
+
+Another option for authenticating your API requests is using either your organization client ID and client secret, or your application client ID and client secret, which will authenticate your request as an organization or application admin, respectively. Organization credentials can be found in the 'Org Overview' section of the admin portal, and application credentials can be found in the 'Getting Started' section of the admin portal.
+
+<div class="admonition warning"> <p class="first admonition-title">WARNING</p> <p class="last">

+Warning: For server-side use only
+You should never authenticate this way from a client-side app such as a mobile app. A hacker could analyze your app and extract the credentials for malicious use even if those credentials are compiled and in binary format. See Security best practices for additional considerations in keeping access to your app and its data secure.
+</p></div>
+
+This can be a convenient way to authenticate API requests, since there is no need to generate and manage an access token, but please note that you should be very cautious when implementing this type of authentication. Organization-level authentication grants full permission to perform any supported call against your organization and every application in it, and application-level authentication grants full permission to perform any supported call against all of the resources in an application. Should your client id and client secret be compromised, a malicious user would gain broad access to your organization or application.
+
+To authenticate using client id and secret, append the following parameters to your request URL:
+
+    client_id=<your-client-id>&client_secret=<your-client-secret>
+    
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/security-and-auth/authenticating-users-and-application-clients.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/security-and-auth/authenticating-users-and-application-clients.txt b/content/docs/_sources/security-and-auth/authenticating-users-and-application-clients.txt
new file mode 100644
index 0000000..eaa52f4
--- /dev/null
+++ b/content/docs/_sources/security-and-auth/authenticating-users-and-application-clients.txt
@@ -0,0 +1,128 @@
+# Authenticating users & app clients
+
+To protect your Usergrid application data, one of the steps you'll take is to authenticate your app's users. By ensuring that they are who they say they are, you can help ensure that your application's data is available in secure ways. After you've created permission rules that define access to your application and have associated these rules with users, you'll want to add code that authenticates your user, as described in this topic.
+
+<div class="admonition note"> <p class="first admonition-title">Note</p> <p class="last">

+You manage access to your application's data by creating permission rules that govern which users can do what. Users authenticated as Application User have access according to these rules. For more about managing permissions, see [Using Permissions](using-permissions.html).
+</p></div>
+
+
+## Authentication levels
+Usergrid supports four levels of authentication:
+
+* __Application user__: Grant's user access to an API Services application, based on the roles and permissions assigned to the user.
+* __Application client__: Grants full access to perform API requests against an API Services application.
+* __Organization client__: Grants full access to perform API requests against an API Services organization.
+* __Admin user__: Grants full access to perform API requests against any API Services organization that the user is an admin of.
+
+Because the scope of access provided by the application client, organization client, and admin user authentication levels is so broad (and as a result, so powerful), it's a bad practice to use them from a mobile app or any client-side code. Instead, they're better suited to server-side implementations, such as web applications.
+
+For a more detailed description of available authentication levels, see [Authentication levels](user-authentication-types.html).
+
+## Application user authentication (user login)
+Using the username and password values specified when the user entity was created, your app can connect to the Usergrid application endpoint to request an access token. It's also acceptable to use the user's email address in place of the username.
+
+### Using the SDKs
+When a user is logged in using the Usergrid iOS, JavaScript, node.JS and Android SDKs, the returned token is automatically stored in the UsergridDataClient (iOS), DataClient (Android), or Usergrid.Client (JavaScript/node.JS) class instance, and will be sent to the API with all subsequent method calls.
+
+#### Request syntax
+
+    curl -X POST "https://api.usergrid.com/<orgName>/<appName>/token" -d '{"grant_type":"password", "username":<username>, "password":<password>}'
+
+#### Example request
+
+    curl -X POST "https://api.usergrid.com/my-org/my-app/token" -d '{"grant_type":"password", "username":"john.doe", "password":"testpw"}'
+		
+#### Example response
+
+The results include the access token needed to make subsequent API requests on behalf of the application user:
+
+    {
+    "access_token": "5wuGd-lcEeCUBwBQVsAACA:F8zeMOlcEeCUBwBQVsAACA:YXU6AAABMq0hdy4",
+    "expires_in": 3600,
+        "user": {
+            ...
+        }
+    }
+		
+## Application client authentication
+Using your app’s client id and client secret values, your app can connect to the Usergrid application endpoint to request an access token. The client ID and secret for your app can be found in 'Getting Started' section of the API Services admin portal, under 'Server App Credentials'.
+
+<div class="admonition warning"> <p class="first admonition-title">WARNING</p> <p class="last">

+Warning: You should never authenticate this way from a client-side app such as a mobile app. A hacker could analyze your app and extract the credentials for malicious use even if those credentials are compiled and in binary format. See "safe mobile access" in [Authenticating API requests](authenticating-api-requests.html) for additional considerations in keeping access to your app and its data secure.
+</p></div>
+
+### Request syntax
+
+    curl -X POST "https://api.usergrid.com/<orgName>/<appName>/token" -d '{"grant_type":"client_credentials", "client_id":<application_clientID>, "client_secret":"<application_client_secret>"}'
+    
+### Example request
+
+    curl -X POST "https://api.usergrid.com/my-org/my-app/token" -d '{"grant_type":"client_credentials", "client_id":"YXB7NAD7EM0MEeJ989xIxPRxEkQ", "client_secret":"YXB7NAUtV9krhhMr8YCw0QbOZH2pxEf"}'
+		
+### Example response
+
+The results include the access token needed to make subsequent API requests on behalf of the application:
+
+    {
+        "access_token": "F8zeMOlcEeCUBwBQVsAACA:YXA6AAABMq0d4Mep_UgbZA0-sOJRe5yWlkq7JrDCkA",
+        "expires_in": 3600,
+        "application": {
+            ...  
+        }
+    }
+		
+## Admin user authentication
+If you do require admin user access, your app can connect to the Usergrid management endpoint to request an access token. Your app supplies the username and password of an admin user in the request.
+
+<div class="admonition warning"> <p class="first admonition-title">WARNING</p> <p class="last">

+Warning: Authenticating as an admin user grants full access to one or more organizations and all of the applications contained in those organizations. Due to this, be cautious when implementing this type of authentication in client-side code. Instead, consider implementing admin user access in server-side code only. See "safe mobile access" in [Authenticating API requests](authenticating-api-requests.html) for additional considerations in keeping access to your app and its data secure.
+</p></div>
+
+### Request syntax
+
+    curl -X POST "https://api.usergrid.com/management/token" -d '{"grant_type":"password", "username":<admin_username>, "password":<admin_password>}'
+    
+### Example Request
+
+    curl -X POST "https://api.usergrid.com/management/token"  -d '{"grant_type":"password", "username":"testadmin", "password":"testadminpw"}'
+
+### Example response
+
+The results include the access token needed to make subsequent API requests on behalf of the admin user:
+
+    {
+        "access_token": "f_GUbelXEeCfRgBQVsAACA:YWQ6AAABMqz_xUyYeErOkKjnzN7YQXXlpgmL69fvaA",
+        "expires_in": 3600,
+        "user": {
+            ...
+        }
+    }		    
+		
+## Organization client authentication
+If you do require organization level access, your app can connect to the Usergrid management endpoint to request an access token. Access to an organization requires the client id and client secret credentials. The client ID and secret for your organization can be found on the 'Org Administration' page of the API Services admin console under 'Organization API Credentials'.
+
+<div class="admonition warning"> <p class="first admonition-title">WARNING</p> <p class="last">

+Warning: You should never authenticate this way from a client-side app such as a mobile app. A hacker could analyze your app and extract the credentials for malicious use even if those credentials are compiled and in binary format. See "safe mobile access" in [Authenticating API requests](authenticating-api-requests.html for additional considerations in keeping access to your app and its data secure.
+</p></div>
+
+### Request syntax
+
+    curl -X POST "https://api.usergrid.com/management/token" -d '{"grant_type":"client_credentials", "client_id":<org_clientID>, "client_secret":<org_client_secret>}'
+    
+### Example request
+
+    curl -X POST "https://api.usergrid.com/management/token" -d '{"grant_type":"client_credentials", "client_id":"YXB7NAD7EM0MEeJ989xIxPRxEkQ", "client_secret":"YXB7NAUtV9krhhMr8YCw0QbOZH2pxEf"}'
+	
+### Example response
+
+The results include the access token needed to make subsequent API requests to the organization:
+
+    {
+        "access_token": "gAuFEOlXEeCfRgBQVsAACA:b3U6AAABMqz-Cn0wtDxxkxmQLgZvTMubcP20FulCZQ",
+        "expires_in": 3600,
+        "organization": {
+            ...
+        }
+    }
+    
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/security-and-auth/changing-token-time-live-ttl.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/security-and-auth/changing-token-time-live-ttl.txt b/content/docs/_sources/security-and-auth/changing-token-time-live-ttl.txt
new file mode 100644
index 0000000..2148d36
--- /dev/null
+++ b/content/docs/_sources/security-and-auth/changing-token-time-live-ttl.txt
@@ -0,0 +1,61 @@
+# Changing token expiration (time-to-live)
+
+An access token has a “time-to-live” (ttl), which is the maximum time that the access token will be valid for use within the application. With the Usergrid, you can change the default ttl for all application user tokens, set the ttl for an individual token at the time of creation, or revoke one or more tokens. This gives you a high degree of control over access to your Usergrid account and data store.
+
+## Default ttl
+By default, all tokens have a system-defined time-to-live of 7 days (604800 seconds). Note that Token ttl is specified in milliseconds, but when a token is created, the API response will return the ttl in seconds.
+
+## Changing the default ttl
+You can change the default ttl for all application user tokens (that is, tokens associated with a user entity) by updating the application entity’s accesstokenttl property. Changing the default ttl will only affect new tokens. Any existing tokens will not be affected.
+
+Please note that this does not apply to application client, organization client or admin user tokens. For more on obtaining tokens for these other authorization levels, see [Authenticating users and application clients](authenticating-users-and-application-clients.html).
+
+__Note__: If you set ttl=0, the token will never expire. This can pose a security risk and should be used with caution.
+
+### Request syntax
+
+    curl -X PUT https://api.usergrid.com/<org_name>/<app_name> -d '{"accesstokenttl":<ttl_in_milliseconds>}'
+    
+### Example Request
+
+    curl -X PUT https://api.usergrid.com/your-org/your-app -d '{"accesstokenttl":"1800000"}'
+    
+### Example response
+
+    {
+      "action" : "put",
+      "application" : "d878de4r-99a7-11e3-b31d-5373d7165c2d",
+      "params" : {
+        "access_token" : [ "DFR4d5M1mJmoEeOGVPncm-g9qgAAAURv_lfQ7uu6aYHjJJn7QCrGoVnvU-ob5Ko" ]
+      },
+      "uri" : "https://api.usergrid.com/amuramoto/secured",
+      "entities" : [ {
+        "uuid" : "d878de4r-99a7-11e3-b31d-5373d7165c2d",
+        "type" : "application",
+        "name" : "your-org/your-app",
+        "created" : 1392843003032,
+        "modified" : 1392843615777,
+        "accesstokenttl" : 1800000,
+        "organizationName" : "your-org",
+        "applicationName" : "your-app",
+        "apigeeMobileConfig" : "{...}",
+        "metadata" : {
+          "collections" : [ "activities", "assets", "devices", "events", "folders", "groups", "roles", "users" ]
+        }
+      } ],
+      "timestamp" : 1392843615767,
+      "duration" : 28,
+      "organization" : "your-org",
+      "applicationName" : "your-app"
+    }
+
+## Changing ttl when a token is created
+When you request an access token, you can override its ttl by including a ttl property in the body of the request when the token is created. This applies to tokens for all authentication levels, including application user, admin user, organization client, and application client authentication levels.
+
+The ttl must be equal to or less than the value of the application entity's accesstokenttl property. If you specify a ttl value greater than the value of accesstokenttl, an error message is returned that indicates the maximum time to live value that can be specified.
+
+For example, the following would create an application user token with a ttl of 180000000 milliseconds:
+
+    curl -X POST https://api.usergrid.com/your-org/your-app/token -d '{"username":"someUser", "password":"somePassword", "grant_type":"password", "ttl":"180000000"}'
+    
+__Note__: If you set ttl=0, the token will never expire. This can pose a security risk and should be used with caution.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/security-and-auth/facebook-sign.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/security-and-auth/facebook-sign.txt b/content/docs/_sources/security-and-auth/facebook-sign.txt
new file mode 100644
index 0000000..e2c7411
--- /dev/null
+++ b/content/docs/_sources/security-and-auth/facebook-sign.txt
@@ -0,0 +1,158 @@
+# Facebook sign in
+
+You can authenticate your Usergrid requests by logging into Facebook. To access Usergrid resources, you need to provide an access token with each request (unless you use the sandbox app). You can get an access token by connecting to an appropriate web service endpoint and providing the correct client credentials — this is further described in Authenticating users and application clients. However, you can also obtain an access token by logging into Facebook.
+
+To enable authentication to Usergrid through Facebook, do the following in your app:
+
+1. Make a login call to the Facebook API (do this using the Facebook SDK or API). If the login succeeds, a Facebook access token is returned.
+2. Send the Facebook access token to Usergrid. If the Facebook access token is valid and the user does not already exist in Usergrid, Usergrid provisions a new Usergrid user. It also returns an Usergrid access token, which you can use for subsequent Usergrid API calls. Behind the scenes, Usergrid uses the Facebook access token to retrieve the user's profile information from Facebook.
+3. If the Facebook access token is invalid, Facebook returns an OAuth authentication error, and the login does not succeed.
+
+The request to authenticate to Usergrid using a Facebook access token is:
+
+    GET https://api.usergrid.com/{my_org}/{my_app}/auth/facebook?fb_access_token={fb_access_token}
+    
+where:
+
+* ``{my_org}`` is the organization UUID or organization name.
+* ``{my_app}`` is the application UUID or application name.
+* ``{fb_access_token}`` is the Facebook access token.
+
+## Facebook login example
+The Facebook technical guides for login present detailed information on how to add Facebook login to your app. Instructions are provided for JavaScript, iOS, and Android.
+
+In brief, here are the steps for JavaScript. You can see these steps implemented in the Facebook login example packaged with the JavaScript SDK for Usergrid (which you can download in ZIP format or tar.gz format). The Facebook login example is in the /examples/facebook directory of the extracted download. The code example snippets shown below are taken from the Facebook login example.
+
+### Step 1: Create a Facebook app
+Create a new app on the Facebook App Dashboard. Enter your app's basic information. Once created, note the app ID shown at the top of the dashboard page.
+
+### Step 2: Invoke the Facebook OAuth dialog
+Invoke the Facebook OAuth Dialog. To do that, redirect the user's browser to a URL by inserting the following Javascript code after the opening <body> tag in your app’s HTML file:
+
+    https://www.facebook.com/dialog/oauth/?
+        client_id={YOUR_APP_ID}
+        &redirect_uri={YOUR_REDIRECT_URL}
+        &state={YOUR_STATE_VALUE}
+        &scope={COMMA_SEPARATED_LIST_OF_PERMISSION_NAMES}
+        &response_type={YOUR_RESPONSE_TYPE}
+    
+where:
+
+``{YOUR_APP_ID}`` is the app ID.
+``{YOUR_REDIRECT_URL}`` is the application UUID or application name.
+``{YOUR_STATE_VALUE}`` is a unique string used to maintain application state between the request and callback.
+``{COMMA_SEPARATED_LIST_OF_PERMISSION_NAMES}`` is a comma separated list of permission names which you would like the user to grant your application.
+``{YOUR_RESPONSE_TYPE}``is the requested response type, either code or token. Defaults to code. Set the response type to token. With the response type set to token, the Dialog's response will include an OAuth user access token in the fragment of the URL the user is redirected to, as per the client-side authentication flow.
+
+Here is how it’s done in the Facebook login example:
+
+    var apiKey = $("#api-key").val();
+    var location = window.location.protocol + '//' + window.location.host;
+    var path = window.location.pathname;
+
+    var link = "https://www.facebook.com/dialog/oauth?client_id=";
+    link += apiKey;
+    link += "&redirect_uri=";
+    link += location+path
+    link += "&scope&COMMA_SEPARATED_LIST_OF_PERMISSION_NAMES&response_type=token";
+
+    //now forward the user to facebook
+    window.location = link;
+    
+Notice that the response type is set to token. As a result, a Facebook access token will be appended to the URL to which the user is redirected.
+
+### Step 3: Add the JavaScript SDK for Facebook
+Add the following Javascript SDK initialization code after the code that invokes the Facebook OAuth Dialog. The code will load and initialize the JavaScript SDK in your HTML page. Replace ``YOUR_APP_ID`` with the App ID noted in Step 1, and WWW.YOUR_DOMAIN.COM with your own domain.
+
+    window.fbAsyncInit = function() {
+        FB.init({
+          appId      : 'YOUR_APP_ID', // App ID
+          channelUrl : '//WWW.YOUR_DOMAIN.COM/channel.html', // Channel File
+          status     : true, // check login status
+          cookie     : true, // enable cookies to allow the server to access the session
+          xfbml      : true  // parse XFBML
+        });
+    
+Here is how the window.fbAsynchInit() function is implemented in the Facebook login example:
+
+    //load up the facebook api sdk
+      window.fbAsyncInit = function() {
+        FB.init({
+          appId      : '308790195893570', // App ID
+          channelUrl : '//usergridsdk.dev//examples/channel.html', // Channel File
+          status     : true, // check login status
+          cookie     : true, // enable cookies to allow the server to access the session
+          xfbml      : true  // parse XFBML
+        });
+      };
+      
+### Step 4. Setup FB.login
+Whenever a user is either not logged into Facebook or not authorized for an app, it is useful to prompt them with the relevant dialog. The ``FB.login()`` Javascript SDK function automatically displays the correct one to the user.
+
+To integrate ``FB.login()`` function in your existing code:
+
+    function login() {
+        FB.login(function(response) {
+            if (response.authResponse) {
+                // connected
+            } else {
+                // cancelled
+            }
+        });
+    }
+
+Here is how ``FB.login()`` is implemented in the Facebook login example:
+
+    function login(facebookAccessToken) {
+        client.loginFacebook(facebookAccessToken, function(err, response){
+          var output = JSON.stringify(response, null, 2);
+          if (err) {
+            var html = '<pre>Oops!  There was an error logging you in. \r\n\r\n';
+            html += 'Error: \r\n' + output+'</pre>';
+          } else {
+            var html = '<pre>Hurray!  You have been logged in. \r\n\r\n';
+            html += 'Facebook Token: ' + '\r\n' + facebookAccessToken + '\r\n\r\n';
+            html += 'Facebook Profile data stored in Usergrid: \r\n' + output+'</pre>';
+          }
+          $('#facebook-status').html(html);
+        })
+      }
+ 
+The ``client.loginFacebook()`` function is provided by the Usergrid JavaScript SDK. It uses the Facebook auth token to obtain an Usergrid auth token. If the Facebook access token is valid and the user does not already exist in Usergrid, the function creates a user entity for the user. It also uses the Facebook access token to retrieve the user's profile information from Facebook.
+
+Here is what the ``client.loginFacebook()`` function looks like:
+
+    Usergrid.Client.prototype.loginFacebook = function (facebookToken, callback) {
+      var self = this;
+      var options = {
+        method:'GET',
+        endpoint:'auth/facebook',
+        qs:{
+          fb_access_token: facebookToken
+        }
+      };
+      this.request(options, function(err, data) {
+        var user = {};
+        if (err && self.logging) {
+          console.log('error trying to log user in');
+        } else {
+          user = new Usergrid.Entity('users', data.user);
+          self.setToken(data.access_token);
+        }
+        if (typeof(callback) === 'function') {
+          callback(err, data, user);
+        }
+      });
+    }
+
+Notice that the function also returns an Usergrid access token, which you can use for subsequent Usergrid API calls.
+
+Remember to create a client for your app, which is the main entry point to the JavaScript SDK for Usergrid. You need to do this before you can use the SDK. Here’s the code to create a client:
+
+    var client = new Usergrid.Client({
+        orgName:'yourorgname',
+        appName:'yourappname',
+        logging: true, //optional - turn on logging, off by default
+        buildCurl: true //optional - turn on curl commands, off by default
+    });
+

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/security-and-auth/revoking-tokens-logout.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/security-and-auth/revoking-tokens-logout.txt b/content/docs/_sources/security-and-auth/revoking-tokens-logout.txt
new file mode 100644
index 0000000..386f04f
--- /dev/null
+++ b/content/docs/_sources/security-and-auth/revoking-tokens-logout.txt
@@ -0,0 +1,32 @@
+# Revoking tokens (logout)
+
+Under certain circumstances, you may need to explicitly revoke one or more tokens associated with a user entity, such as when a user logs out of your app. This is accomplished by making a PUT request to the /revoketoken and /revoketokens endpoints.
+
+## Revoking tokens (user logout)
+If a user has been logged in using the Usergrid iOS, Android, JavaScript or node.JS SDKs, the returned token is automatically stored in the UsergridDataClient (iOS), DataClient (Android), Usergrid.Client (JavaScript), Usergrid.Client (node.JS) class instance. Calling the logout method of the SDK will destroy the token on the server, as well as in the client object.
+
+### Request syntax
+
+Revoke all tokens associated with a user entity
+
+    curl -X PUT https://api.usergrid.com/<org_name>/<app_name>/users/<user_uuid_or_username>/revoketokens
+		
+Revoke a specific token associated with a user entity
+
+    curl -X PUT https://api.usergrid.com/<org_name>/<app_name>/users/<user_uuid_or_username>/revoketoken?token=<token_to_revoke>			
+		
+### Example request
+
+    curl -X PUT https://api.usergrid.com/your-org/your-app/users/someUser/revoketokens
+		
+Example response
+
+    {
+      "action" : "revoked user token",
+      "timestamp" : 1382050891455,
+      "duration" : 24
+    }
+            
+### Revoking admin user tokens
+
+The /revoketoken and /revoketokens endpoints also work for revoking admin user tokens by making a PUT request to /management/users/<org_admin_username>/

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/security-and-auth/securing-your-app.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/security-and-auth/securing-your-app.txt b/content/docs/_sources/security-and-auth/securing-your-app.txt
new file mode 100644
index 0000000..6eb043f
--- /dev/null
+++ b/content/docs/_sources/security-and-auth/securing-your-app.txt
@@ -0,0 +1,44 @@
+# Security best practices
+
+There a number of actions you should take to ensure that your app is secure before you put it into production. The following is not an exhaustive list, but offers some common best practices you should consider following to keep your app secure when using the Usergrid.
+
+## Never use the 'sandbox' for a production app
+By default, every new Usergrid account has an app named “sandbox” that is already created under your new organization. This app is no different than any other app that you might create, except that the Guest role has been given full permissions (that is, /** for GET, POST, PUT, and DELETE). This eliminates the need for a token when making application level calls, and can make it much easier to get your app up and running; however, it also means that any data in the sandbox application is completely unsecured.
+
+As with any other app, you can secure the sandbox application by updating its roles and permissions. For more on working with permissions and roles, see [Using Permissions](using-permissions.html).
+
+## Review permissions in your apps
+Prior to launching your app into a production environment, it is advisable to review all the roles and permissions you have set up, as well as the groups and users you have assigned those permissions and roles to. During development, you may find that you added various permissions which may or may not still be required once the app is complete. Review all permissions and delete any that are no longer required.
+
+Prior to taking your app live, you should secure it by removing any unnecesary Guest permissions. (See [Using Permissions](using-permissions.html) for further information about setting permissions.) After you secure your the app, any calls to the API will need to include an OAuth token. Oauth tokens (also called access tokens) are obtained by the API in response to successful authentication calls. Your app saves the token and uses it for all future calls during that session. Learn more about access tokens in Authenticating users and application clients.
+
+## Edit the 'default' role
+When preparing an application for production use, a good first step is to edit permission rules for the Default role. The permissions in this role will be applied to every user who authenticates with a valid access token.
+
+For example, in the Default role, you will most likely first want to remove the permission rule that grants full access to all authenticated users:
+
+    GET,PUT,POST,DELETE:/users/me/**
+
+For more on roles, see [Using Permissions](using-permissions.html).
+
+Review test accounts
+If you created any test user or test administrator accounts during development, these should also be reviewed for relevancy and security. Delete any test accounts that are no longer needed. If these accounts are still needed, make sure that passwords have been secured to the standards required by your app.
+
+## Use https
+Make sure that any calls you make to the API are done using the secure https protocol, and not the insecure http protocol. 
+
+If your app is a web app, that is, an app served by a web server, make sure that the app is served using https.
+
+## Acquire access tokens in a secure way
+There are various methods for acquiring an access token (see [Authenticating users and application clients](authenticating-users-and-application-clients.html). One method is to use the application or organization level client secret-client id combination. This method should not be used in client applications (this is, apps that are deployed to a device, and which authenticate and make calls against the API).
+
+That’s because a hacker could analyze your app (even a compiled, binary distribution of your app), and retrieve the secret-id combination. Armed with this information, an attacker could gain full access to the data in your account.
+
+Instead, use application user credentials. This means that your app’s users should provide a username and password. Your app would use these to authenticate against the API and retrieve an access token.
+
+The client secret-client id combination should be used only in secure, server-side applications where there is no possibility of a hacker gaining control of the credentials.
+
+## Treat mobile clients as untrustworthy
+For mobile access, it is recommended that you connect as an application user with configured access control policies. Mobile applications are inherently untrusted because they can be easily examined and even decompiled.
+
+Any credentials stored in a mobile app should be considered secure only to the Application User level. This means that if you don’t want the user to be able to access or delete data in your Usergrid application, you need to make sure that you don’t enable that capability through roles or permissions. Because most web applications talk to the database using some elevated level of permissions, such as root, it’s generally a good idea for mobile applications to connect with a more restricted set of permissions. For more information on restricting access through permission rules, see [Using Permissions](using-permissions.html).

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/security-and-auth/user-authentication-types.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/security-and-auth/user-authentication-types.txt b/content/docs/_sources/security-and-auth/user-authentication-types.txt
new file mode 100644
index 0000000..1a14f50
--- /dev/null
+++ b/content/docs/_sources/security-and-auth/user-authentication-types.txt
@@ -0,0 +1,63 @@
+# Authentication levels
+
+Usergrid supports four levels of authentication, but only one of them is used when checking a registered user's permissions. The other three levels are useful for authenticating other application or web clients that require higher-level access to your Usergrid application or organization. Because the scope of access that the other authentication levels provide is so broad (and as a result, so powerful), it's a bad practice to use them from a mobile app. Instead, they're better suited to other client apps, such as web applications.
+
+## Configuring authentication levels
+Access permissions can only be configured for the 'application user' – this can be done both programmatically and in the admin portal. The application, organization and admin clients cannot be configured, and can only be accessed programmatically via the API.
+
+For more about creating and managing roles and permissions for application users, see Managing access by defining permission rules. For a look at how security features fit together, see App Security Overview.
+
+## User authentication level
+
+<table class="usergrid-table">
+<tr>
+    <th>Authentication Level</th>
+    <th>Description</th>
+</tr>
+<tr>
+    <td>Application user</td>
+    <td>This is the standard authentication type you will use to implement user login for your app. The application user level allows access to your Usergrid application as governed by the permission rules you create and associated with users and user groups. For more on setting permissions see Managing access by defining permission rules. Each Application User is represented by a User entity in your Usergrid application. For more about the User entity, see User.</td>
+</tr>
+</table>
+
+## Admin authentication levels
+
+<div class="admonition warning"> <p class="first admonition-title">WARNING</p> <p class="last">

+Warning: Safe use of admin authentication levels. Never use client ID and client secret, or any hard-coded credentials to authenticate this way from a client-side app, such as a mobile app. A hacker could analyze your app and extract the credentials for malicious use even if those credentials are compiled and in binary format. Even when authenticating with username and password, be cautious when using these authentication levels since they grant broad access to your Usergrid account. See "safe mobile access" in Authenticating API requests for additional considerations in keeping access to your app and its data secure.</p></div>
+
+<table class="usergrid-table">
+<tr>
+    <th>Authentication Level</th>
+    <th>Description</th>
+</tr>
+<tr>
+   <td>Application client</td>
+   <td>Grants full access to perform any operation on an Usergrid application (but not other applications within the same organization).
+        
+   <p>Authentication at this level is useful in a server-side application (not a mobile app) that needs access to resources through the Usergrid API. For example, imagine you created a website that lists every hiking trail in the Rocky Mountains. You would want anyone to be able to view the content, but would not want them to access the Usergrid API and all your data directly. Instead, you would authenticate as an application client in your server-side code to access the data via the API in order to serve it to your website's visitors.</p></td>
+</tr>
+<tr>
+   <td>Organization client</td>
+   <td>Grants full access to perform any operation on an Usergrid organization.
+        
+   <p>This authentication level provides the greatest amount of access to an individual organization, allowing a client to perform any operation on an Usergrid organization and any applications in that organization. This level of access should be used sparingly and carefully.</p></td>
+</tr>
+<tr>
+   <td>Admin user</td>
+   <td>Allows full access to perform any operation on all organization accounts of which the admin user is a member.
+        
+   <p>This authentication level is useful from applications that provide organization-wide administration features. For example, the Usergrid admin portal uses this level of access because it requires full access to the administration features.</p>
+        
+   Unless you have a specific need for administrative features, such as to run test scripts that require access to management functionality, you should not use the admin user authentication level.</td>
+</tr>
+</table>
+
+
+
+
+	
+
+
+	
+
+

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/security-and-auth/using-permissions.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/security-and-auth/using-permissions.txt b/content/docs/_sources/security-and-auth/using-permissions.txt
new file mode 100644
index 0000000..34ec664
--- /dev/null
+++ b/content/docs/_sources/security-and-auth/using-permissions.txt
@@ -0,0 +1,115 @@
+# Using permissions
+
+Permissions allow you to define user access to perform GET, POST, PUT, or DELETE operations on specific resources. When the user submits a request via your app code to the Usergrid API, the user’s permissions are checked against the resource paths that the user is trying to access. The request succeeds only if access to the resource is allowed by the permission rules you specify.
+
+## Permissions syntax
+In Usergrid, permissions are represented in the following format:
+
+    <operations>:<resource_path>
+    
+* ``<operations>``: A comma-delimited set of HTTP methods (``GET``, ``PUT``, ``POST``, ``DELETE``) that are allowed for the specified resource path. For example, ``get``, ``post`` would allow only ``GET`` and ``POST`` requests to be made to the specified resource.
+* ``<resource_path>``: The path to the resources to be accessed. For example, ``/users`` would apply the permission to the users collection, while ``/users/Tom`` would apply the permission to only the user entity with username 'Tom'.
+
+## Complex paths
+Complex paths can be defined using [Apache Ant pattern syntax](http://ant.apache.org/manual/dirtasks.html#patterns). The following special path variables are supported for the construction of complex paths:
+
+<table>
+<tr>
+   <td>Parameter</td>
+   <td>Description</td>
+</tr>
+<tr>
+   <td>*</td>
+   <td>Treated as a wildcard. Assigns the permission to all paths at the specified level in the path hierarchy. For example, ``/*`` would match any collection, while ``/users/Tom/*`` would match /users/Tom/likes and ``/users/Tom/owns``.</td>
+</tr>
+<tr>
+   <td>**</td>
+   <td>Assigns the permission to the path recursively. For example, ``**/likes`` would match ``/likes`` and ``/users/likes``, while ``/users/**`` would match ``/users`` and ``/users/likes``.</td>
+</tr>
+<tr>
+   <td>\${user}</td>
+   <td>Automatically sets the path segment to the UUID of the currently authenticated user. For example, if you sent a request with a valid access token for a user with UUID ``bd397ea1-a71c-3249-8a4c-62fd53c78ce7``, the path ``/users/${user}`` would be interpreted as ``/users/bd397ea1-a71c-3249-8a4c-62fd53c78ce7``, assigning the permission only to that user entity.</td>
+</tr>
+</table>
+
+## Assigning permissions
+Permissions can only be assigned to user, group or role entities. Assigning permissions to roles can be particularly useful, as it allows you to create sets of permissions that represent complex access definitions, which can then be assigned to user and group entities. For more on roles, see Using roles.
+       
+### Request syntax
+
+    curl -X POST https://api.usergrid.com/<org>/<app>/<collection>/<entity>/permissions -d '{"permission":<permissions>}'
+    
+Parameters
+
+Parameter	Description
+---------   -----------
+org	        Organization UUID or organization name
+app	        Application UUID or application name
+collection	The collection of the entity that the permissions are to be assigned to. 
+entity	    The UUID of the entity to assign the permissions to. For users, username and for groups, name are also accepted.
+permissions	The permissions to assign to the entity. See Permissions syntax for format.
+
+For collections, Valid values are users and groups.
+
+### Example request
+For example, the following cURL request would give the user 'Tom' POST permission to the /users collection:
+
+    curl -X POST https://api.usergrid.com/your-org/your-app/users/Tom/permissions -d '{"permission":"post:/users"}'
+    
+### Example response
+The newly assigned permission is returned in the data property of the response:
+
+		{
+		  "action" : "post",
+		  "application" : "f34f4222-a166-11e2-a7f7-02e81adcf3d0",
+		  "params" : { },
+		  "uri" : "https://api.usergrid.com/your-org/your-app",
+		  "entities" : [ ],
+		  "data" : [ "post:/users" ],
+		  "timestamp" : 1402349612382,
+		  "duration" : 19,
+		  "organization" : "your-org",
+		  "applicationName" : "your-app"
+		}
+		
+
+## Removing permissions
+Using a DELETE request, you can remove one of more permissions from a user, group, or role entity.
+
+### Request syntax
+
+    curl -X DELETE https://api.usergrid.com/<org>/<app>/<collection>/<entity>/permissions?=<permissions>
+    
+Parameters
+
+Parameter	Description
+---------   -----------
+org	        Organization UUID or organization name
+app	        Application UUID or application name
+collection	The collection of the entity that the permissions are to be assigned to. Valid values are users and groups.
+entity	    The UUID of the entity to assign the permissions to. For users, username and for groups, name are also accepted.
+permissions	The permissions to assign to the entity. See [Permissions syntax](using-permissions.html) for format.
+
+
+### Example request
+
+    curl -X DELETE https://api.usergrid.com/your-org/your-app/users/Tom/permissions?permission=post:/users
+    
+### Example response
+The deleted permission is returned in the params.permission property of the response:
+
+    {
+      "action" : "delete",
+      "application" : "f34f4222-a166-11e2-a7f7-02e81adcf3d0",
+      "params" : {
+        "permission" : [ "post:/users" ]
+      },
+      "uri" : "https://api.usergrid.com/your-org/your-app",
+      "entities" : [ ],
+      "data" : [ "post:/assets" ],
+      "timestamp" : 1402349951530,
+      "duration" : 20,
+      "organization" : "your-org",
+      "applicationName" : "your-app"
+    }		
+	
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/user-management/activity.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/user-management/activity.txt b/content/docs/_sources/user-management/activity.txt
new file mode 100644
index 0000000..2703ab8
--- /dev/null
+++ b/content/docs/_sources/user-management/activity.txt
@@ -0,0 +1,440 @@
+# Activity
+
+Most modern applications struggle to manage data streams, such as those
+that contain an ongoing list of comments, activities, and tweets. In
+particular, mobile applications are prone to generating very large
+amounts of data in a data stream. Beyond that, additions to a data
+stream must often be routed automatically to subscribers or filtered or
+counted.
+
+Usergrid provides an activity entity that is specifically designed
+for data streams. An activity is an entity type that represents activity
+stream actions (see the [JSON Activity Streams 1.0
+specification](http://activitystrea.ms/specs/json/1.0/) for more
+information about these actions).
+
+When a user creates an activity, it creates a relationship between the
+activity and the user who created it. Because this relationship exists,
+the activity will appear in the feed of any of the user’s followers.
+Think of the Activities endpoint (/users/{uuid|username}/activities) as
+an "outbox" of news items created by the user. Think of the Feed
+endpoint (/users/{uuid|username}/feed) as an "inbox" of news items meant
+to be seen or consumed by the user.
+
+A user can also post an activity to a group (located at
+/groups/{uuid|groupname}/activities). This allows you to emulate
+Facebook-style group functionality, where a limited number of users can
+share content on a common "wall". In any of these cases, there is no
+need to construct publish/subscribe relationships manually.
+
+Activity entities are particularly useful in applications that enable
+users to post content to activity streams (also called feeds) and to
+display activity streams. Some examples of these applications are
+Twitter, foursquare, and Pinterest. For example, when a Twitter user
+posts a short, 140-character or less, "tweet", that activity gets added
+to the user's activity stream for display as well as to the activity
+streams of any of the user's followers.
+
+Using Usergrid APIs you can create, retrieve, update, and delete
+activity entities. See You do not have access to view this node for
+descriptions of these APIs.
+
+**Note:** Although not shown in the API examples below, you need to
+provide a valid access token with each API call. See 
+[Authenticating users and application clients](../security-and-auth/authenticating-users-and-application-clients.html) for details.
+
+
+## Posting activities
+
+Posting a user activity
+
+Use the  POST method to create an activity in the activities collection.
+
+### Request URI
+
+    POST /<org_id>/<app_id>/users/<uuid | username>/activities { request body }
+
+Parameters
+
+Parameter	            Description
+---------               -----------
+arg uuid|string org_id	Organization UUID or organization name
+arg uuid|string app_id	Application UUID or application name
+request body	        One or more sets of activity properties
+
+Here's an example request body:
+
+    {
+        "actor":{
+            "displayName":"John Doe",
+            "uuid":"1f3567aa-da83-11e1-afad-12313b01d5c1",
+            "username":"john.doe",
+            "image":{
+                "duration":0,
+                "height":80,
+                "url":"http://www.gravatar.com/avatar/","width":80},
+                "email":"john.doe@gmail.com"
+            },
+            "verb":"post",
+            "content":"Hello World!"
+        }
+    }
+    
+### Example - Request
+
+    curl -X POST "https://api.usergrid.com/my-org/my-app/users/john.doe/activities" -d '{"actor":{"displayName":"John Doe","uuid":"1f3567aa-da83-11e1-afad-12313b01d5c1","username":"john.doe", "image":{"duration":0,"height":80,"url":"http://www.gravatar.com/avatar/","width":80}, "email":"john.doe@gmail.com"},"verb":"post","content":"Hello World!"}'
+    
+### Example - Response
+
+    {
+        "action" : "post",
+        "application" : "5111c463-6a42-11e1-b6dd-1231380a0284",
+         "params" : {
+        },
+        "path" : "/users/1f3567aa-da83-11e1-afad-12313b01d5c1/activities",
+        "uri" : "https://api.usergrid.com/5111c463-6a42-11e1-b6dd-1231380a0284/users/1f3567aa-da83-11e1-afad-12313b01d5c1/activities",
+        "entities" : [ {
+            "uuid" : "da448955-f3aa-11e1-8042-12313d331ae8",
+            "type" : "activity",
+            "created" : 1346445092974,
+            "modified" : 1346445092974,
+            "actor" : {
+                "displayName" : "John Doe",
+                "uuid" : "1f3567aa-da83-11e1-afad-12313b01d5c1",
+                "username" : "john.doe",
+                "image" : {
+                    "duration" : 0,
+                    "height" : 80,
+                    "url" : "http://www.gravatar.com/avatar/",
+                    "width" : 80
+                },
+                "email" : "john.doe@gmail.com"
+            },
+            "content" : "Hello World!",
+            "metadata" : {
+                "path" : "/users/1f3567aa-da83-11e1-afad-12313b01d5c1/activities/da448955-f3aa-11e1-8042-12313d331ae8"
+            },
+            "published" : 1346445092974,
+            "verb" : "post"
+        } ],
+        "timestamp" : 1346445092827,
+        "duration" : 1406,
+        "organization": "my-org",
+        "applicationName": "my-app"
+    }
+
+__Note__: Anytime a logged-in user makes a request, you can substitute "me" for the uuid or username. So the format of a request to create an activity for the currently logged-in user would look like this:
+
+    POST /<org_id>/<app_id>/users/me/activities { request body }
+
+The ``/users/me`` endpoint is accessible only if you provide an access token with the request. If you don't provide an access token with the request, that is, you make an anonymous (or "guest") call, the system will not be able to determine which user to return as ``/users/me``.
+
+When you create an activity it creates a relationship between the activity and the user who created it. In other words, the newly created activity above belongs to john.doe. Another way of saying this is the user "owns" the activity. And because this relationship exists, the activity will appear in the feed of any of the user’s followers (in this example, anyone who is following john.doe). However, it will not appear in the feed of people the user follows. The activity is accessible at the ``/activities`` endpoint to users who have the permission to read that endpoint.
+
+Notice the properties specified in the request body in the previous example are actor, verb, and content. The actor, verb, and content properties are built into the Activity entity (see Default Data Entity Types). The actor property specifies properties of the entity that performs the action (here, user john.doe). The gravatar URL is used to create an icon for the activity. And because an Activity is simply an API Services data entity, you can also create custom properties.
+
+The verb parameter is descriptive. You can use it to indicate what type of activity is posted, for example, an image versus text. The value post is defined in the JSON Activity Streams specification as “the act of authoring an object and then publishing it online.“
+
+## Posting an activity to a group
+
+Use the POST method to post an activity to a specific group. In this case the activity is created in the activities collection and is accessible at the /activities endpoint to users who have the permission to read that endpoint. In addition, a relationship is established between the activity and the group, and because of that, the activity will appear in the group’s feed. The group "owns" the activity. Also, the activity will be published in the feed of all users that are members of the group.
+
+### Request URI
+
+    POST /{org_id}/{app_id}/groups/{uuid|groupname}/activities {request body}
+
+Parameters
+
+Parameter	               Description
+---------                  -----------
+arg uuid|string org_id	   Organization UUID or organization name
+arg uuid|string app_id	   Application UUID or application name
+arg uuid|string groupname  UUID or name of the group
+request body	           One or more sets of activity properties.
+
+Here's a sample request body:
+
+    {
+      "actor":
+        {
+        "displayName":"John Doe",
+        "uuid":"1f3567aa-da83-11e1-afad-12313b01d5c1",
+        "username":"john.doe",
+        "image":{
+          "duration":0,
+          "height":80,
+          "url":"http://www.gravatar.com/avatar/","width":80},
+      "email":"john.doe@gmail.com"},
+      "verb":"post",
+      "content":"Hello World!"    
+    }
+    
+### Example - Request
+
+    curl -X POST "https://api.usergrid.com/my-org/my-app/groups/mygroup/activities" -d '{"actor":{"displayName":"John Doe","uuid":"1f3567aa-da83-11e1-afad-12313b01d5c1","username":"john.doe", "image":{"duration":0,"height":80,"url":"http://www.gravatar.com/avatar/","width":80}, "email":"john.doe@gmail.com"},"verb":"post","content":"Hello World!"}'
+    
+Because this relationship exists, this activity will appear in the feed of all users who are members of mygroup. It won't appear in the feeds of the group members’ followers or in feeds of users they follow.
+
+### Example - Response
+
+    {
+      "action": "post",
+      "application": "3400ba10-cd0c-11e1-bcf7-12313d1c4491",
+      "params":  {},
+      "path": "/groups/d87edec7-fc4d-11e1-9917-12313d1520f1/activities",
+      "uri": "https://api.usergrid.com/my-org/my-app/groups/d87edec7-fc4d-11e1-9917-12313d1520f1/activities",
+      "entities":  [
+         {
+          "uuid": "563f5d96-37f3-11e2-a0f7-02e81ae640dc",
+          "type": "activity",
+          "created": 1353952903811,
+          "modified": 1353952903811,
+          "actor":  {
+            "displayName": "John Doe",
+            "uuid": "1f3567aa-da83-11e1-afad-12313b01d5c1",
+            "username": "john.doe",
+            "image":  {
+              "duration": 0,
+              "height": 80,
+              "url": "http://www.gravatar.com/avatar/",
+              "width": 80
+            },
+            "email": "john.doe@gmail.com"
+          },
+          "content": "Hello World!",
+          "metadata":  {
+            "path": "/groups/d87edec7-fc4d-11e1-9917-12313d1520f1/activities/563f5d96-37f3-11e2-a0f7-02e81ae640dc"
+          },
+          "published": 1353952903811,
+          "verb": "post"
+        }
+      ],
+      "timestamp": 1353952903800,
+      "duration": 81,
+      "organization": "my-org",
+      "applicationName": "my-app"
+    }
+
+## Creating an activity for a user's followers in a group
+
+Use the POST method to create an activity that will be published only in the feeds of users who (1) follow you, and (2) are in the same group to which you posted the activity. This is useful if you want to create specific groups of friends (for example, acquaintances or colleagues) and publish content to them with more precise privacy settings. This allows you to re-create a privacy model similar to Google+’s Circles or Facebook current privacy system.
+
+When you create an activity for a user’s followers in a group:
+
+The activity is accessible at the ``/activities`` endpoint to users who have the permission to read that endpoint. The activity will not be cross-posted to the group’s activity endpoint (``/groups/{uuid|groupname}/activities``)
+A relationship is automatically created between the activity entity that was just created and the user within that group (``/groups/{uuid|groupname}/users/{uuid|username}``)
+The user within the group (``/groups/{uuid|groupname}/users/{uuid|username}```) becomes the owner of the activity (through the owner property in the activity).
+
+### Request URI
+
+    POST /{org_id}/{app_id}/groups/{uuid|groupname}/users/{uuid|username}/activities {request body}
+
+Parameters
+
+Parameter	                Description
+arg uuid|string org_id	    Organization UUID or organization name
+arg uuid|string app_id	    Application UUID or application name
+arg uuid|string groupname	UUID or name of the group
+arg uuid|string username	UUID or name of the user
+request body	            One or more sets of activity properties
+
+Example request body:
+
+    {
+      "actor":
+        {
+        "displayName":"John Doe",
+        "uuid":"1f3567aa-da83-11e1-afad-12313b01d5c1",
+        "username":"john.doe",
+        "image":{
+          "duration":0,
+          "height":80,
+          "url":"http://www.gravatar.com/avatar/","width":80},
+      "email":"john.doe@gmail.com"},
+      "verb":"post",
+      "content":"Hello World!"    
+    }
+    
+### Example - Request
+
+    curl -X POST "https://api.usergrid.com/my-org/my-app/groups/mygroup/users/john.doe/activities" -d '{"actor":{"displayName":"John Doe","uuid":"1f3567aa-da83-11e1-afad-12313b01d5c1","username":"john.doe", "image":{"duration":0,"height":80,"url":"http://www.gravatar.com/avatar/","width":80}, "email":"john.doe@gmail.com"},"verb":"post","content":"Hello World!"}'
+    
+Because this relationship exists, this activity will appear in the feed of all users who are members of mygroup. It won't appear in the feeds of the group members’ followers or in feeds of users they follow.
+
+### Example - Response
+
+    {
+      "action" : "post",
+      "application" : "3400ba10-cd0c-11e1-bcf7-12313d1c4491",
+      "params" : { },
+      "path" : "/groups/d87edec7-fc4d-11e1-9917-12313d1520f1/users/34e26bc9-2d00-11e2-a065-02e81ae640dc/activities",
+      "uri" : "https://api.usergrid.com/my-org/my-app/
+    /groups/d87edec7-fc4d-11e1-9917-12313d1520f1/users/34e26bc9-2d00-11e2-a065-02e81ae640dc/activities",
+      "entities" : [ {
+        "uuid" : "2440ca58-49ff-11e2-84c0-02e81adcf3d0",
+        "type" : "activity",
+        "created" : 1355937094825,
+        "modified" : 1355937094825,
+        "actor" : {
+          "displayName" : "John Doe",
+          "uuid" : "1f3567aa-da83-11e1-afad-12313b01d5c1",
+          "username" : "john.doe",
+          "image" : {
+            "duration" : 0,
+            "height" : 80,
+            "url" : "http://www.gravatar.com/avatar/",
+            "width" : 80
+          },
+          "email" : "john.doe@gmail.com"
+        },
+        "content" : "Happy New Year!",
+        "metadata" : {
+          "path" : "/groups/d87edec7-fc4d-11e1-9917-12313d1520f1/users/34e26bc9-2d00-11e2-a065-02e81ae640dc/activities/2440ca58-49ff-11e2-84c0-02e81adcf3d0"
+        },
+        "published" : 1355937094825,
+        "verb" : "post"
+      } ],
+      "timestamp" : 1355937094789,
+      "duration" : 95,
+      "organization" : "my-org",
+      "applicationName" : "my-app"
+    }
+
+## Retrieving activity feeds
+
+Retrieving a user's activity feed
+
+Use the GET method to retrieve a user’s feed.
+
+### Request URI
+
+    GET /{org_id}/{app_id}/users/{uuid|username}/feed
+
+### Example - Request
+
+    curl -X GET "https://api.usergrid.com/my-org/my-app/users/john.doe/feed"
+    
+### Example - Response
+
+    {
+      "action" : "get",
+      "application" : "3400ba10-cd0c-11e1-bcf7-12313d1c44914",
+      "params" : {},
+      "path" : "/users/d9693ec3-61c9-11e2-9ffc-02e81adcf3d0/feed",
+      "uri" : "https://api.usergrid.com/3400ba10-cd0c-11e1-bcf7-12313d1c44914/users/d9693ec3-61c9-11e2-9ffc-02e81adcf3d0/feed",
+      "entities" : [ {
+        "uuid" : "ffd79647-f399-11e1-aec3-12313b06ae01",
+        "type" : "activity",
+        "created" : 1346437854569,
+        "modified" : 1346437854569,
+        "actor" : {
+          "displayName" : "John Doe",
+          "image" : {
+            "duration" : 0,
+            "height" : 80,
+            "url" : "http://www.gravatar.com/avatar/",
+            "width" : 80
+          },
+          "uuid" : "d9693ec3-61c9-11e2-9ffc-02e81adcf3d0",
+          "email" : "john.doe@gmail.com",
+          "username" : "john.doe"
+        },
+        "content" : "Hello World!",
+        "metadata" : {
+          "cursor" : "gGkAAQMAgGkABgE5ffM1aQCAdQAQ_9eWR_OZEeGuwxIxOwauAQCAdQAQABlaOvOaEeGuwxIxOwauAQA",
+          "path" : "/users/d9693ec3-61c9-11e2-9ffc-02e81adcf3d0/feed/ffd79647-f399-11e1-aec3-12313b06ae01"
+        },
+        "published" : 1346437854569,
+        "verb" : "post"
+      }, {
+        "uuid" : "2482a1c5-e7d0-11e1-96f6-12313b06d112",
+        "type" : "activity",
+        "created" : 1345141694958,
+        "modified" : 1345141694958,
+        "actor" : {
+          "displayName" : "moab",
+          "image" : {
+            "duration" : 0,
+            "height" : 80,
+            "url" : "http://www.gravatar.com/avatar/",
+            "width" : 80
+          },
+          "uuid" : "d9693ec3-61c9-11e2-9ffc-02e81adcf3d0",
+          "email" : "massoddb@mfdsadfdsaoabl.com",
+          "username" : "moab"
+        },
+        "content" : "checking in code left and right!!",
+        "metadata" : {
+          "cursor" : "gGkAAQMAgGkABgE5MLFh7gCAdQAQJIKhxefQEeGW9hIxOwbREgCAdQAQJNEP6ufQEeGW9hIxOwbREgA",
+          "path" : "/users/d9693ec3-61c9-11e2-9ffc-02e81adcf3d0/feed/2482a1c5-e7d0-11e1-96f6-12313b06d112"
+        },
+        "published" : 1345141694958,
+        "verb" : "post"
+      } ],
+      "timestamp" : 1346438331316,
+      "duration" : 144,
+      "organization": "my-org",
+      "applicationName": "my-app"
+    }
+
+## Retrieving a group's activity feed
+
+Use the GET method to retrieve the feed for a group. This gets a list of all the activities that have been posted to this group, that is, the activities for which this group has a relationship (owns).
+
+### Request URI
+
+    GET /{org_id}/{app_id}/groups/{uuid|groupname}/feed
+    
+Parameters
+
+Parameter	Description
+---------   -----------
+arg uuid|string org_id	   Organization UUID or organization name
+arg uuid|string app_id	   Application UUID or application name
+arg uuid|string groupname  UUID or name of the group
+
+### Example - Request
+
+    curl -X GET "https://api.usergrid.com/my-org/my-app/groups/mygroup/feed"
+    
+### Example - Response
+
+    {
+        "action": "get",
+        "application": "3400ba10-cd0c-11e1-bcf7-12313d1c4491",
+        "params":  {},
+        "path": "/groups/d87edec7-fc4d-11e1-9917-12313d1520f1/feed",
+        "uri": "https://api.usergrid.com/my-org/my-app/groups/d87edec7-fc4d-11e1-9917-12313d1520f1/feed",
+        "entities":  [
+           {
+            "uuid": "563f5d96-37f3-11e2-a0f7-02e81ae640dc",
+            "type": "activity",
+            "created": 1353952903811,
+            "modified": 1353952903811,
+            "actor":  {
+              "displayName": "John Doe",
+              "image":  {
+                "duration": 0,
+                "height": 80,
+                "url": "http://www.gravatar.com/avatar/",
+                "width": 80
+              },
+              "uuid": "1f3567aa-da83-11e1-afad-12313b01d5c1",
+              "email": "john.doe@gmail.com",
+            "username": "john.doe"
+            },
+            "content": "Hello World!",
+            "metadata":  {
+              "cursor": "gGkAAQMAgGkABgE7PeHCgwCAdQAQVj9dljfzEeKg9wLoGuZA3ACAdQAQVkVRCTfzEeKg9wLoGuZA3AA",
+              "path": "/groups/d87edec7-fc4d-11e1-9917-12313d1520f1/feed/563f5d96-37f3-11e2-a0f7-02e81ae640dc"
+            },
+            "published": 1353952903811,
+            "verb": "post"
+          }
+        ],
+      "timestamp": 1353953272756,
+      "duration": 29,
+      "organization": "my-org",
+      "applicationName": "my-app"
+    }  
+  
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/user-management/group.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/user-management/group.txt b/content/docs/_sources/user-management/group.txt
new file mode 100644
index 0000000..4f76cb6
--- /dev/null
+++ b/content/docs/_sources/user-management/group.txt
@@ -0,0 +1,365 @@
+# Working with group data
+
+You can organize app users into groups. Groups have their own Activity Feed, their own permissions and be a useful alternative to Roles, depending on how you model your data. Groups were originally designed to emulate Facebook Groups, so they will tend to function about the same way Facebook Groups would.
+
+Groups are hierarchical. Every member of the group ``/groups/california/san-francisco`` is also a member of the group ``/groups/california``.
+
+Groups are also a great way to model things such a topic subscriptions. For example, you could allow people to subscribe (i.e. become a member of the group and be alerted via Activities) to ``/groups/memes/dogs/doge`` or subscribe to all ``/groups/memes/dogs``.
+
+See the [Group Model section of the API Reference](../rest-endpoints/api-docs.html#group) for a list of the system-defined properties for group entities. In addition, you can create group properties specific to your application.
+
+## Creating groups
+
+A group entity represents an application group of users. You can create, retrieve, update, delete, and query group entities. See User entity properties for a list of the system-defined  properties for group entities. In addition, you can create group properties specific to your application.
+
+### Request Syntax
+
+    curl -X POST "https://api.usergrid.com/your-org/your-app/groups" '{ request body }'
+    
+Use the POST method to create a new group. Groups use paths to indicate their unique names. This allows you to create group hierarchies by using slashes. For this reason, you need to specify a path property for a new group.
+
+### Request URI
+
+    POST /{org_id}/{app_id}/groups
+
+Parameters
+
+Parameter	    Description
+---------       -----------
+uuid | org_id	Organization UUID or organization name
+uuid | app_id	Application UUID or application name
+request body	One or more sets of group properties of which path is mandatory.
+ 
+The ``path`` property is required and must be unique, it may include forward slashes to denote hierarchical relationships.
+
+    {
+        "path" : "somegroup/somesubgroup",
+        "title" : "Some SubGroup"
+    }
+
+### Example
+
+__Note__: Although not shown in the API examples below, you need to provide a valid access token with each API call. See Authenticating users and application clients for details.
+
+### Request
+
+    curl -X POST "https://api.usergrid.com/my-org/my-app/groups" -d '{"path":"mynewgroup"}'
+    
+### Response
+
+    {
+        "action": "post",
+        "application": "7fb8d891-477d-11e1-b2bd-22000a1c4e22",
+        "params": {},
+        "path": "/groups",
+        "uri": "https://api.usergrid.com/22000a1c4e22-7fb8d891-477d-11e1-b2bd/7fb8d891-477d-11e1-b2bd-22000a1c4e22/groups",
+        "entities": [{
+            "uuid": "a668717b-67cb-11e1-8223-12313d14bde7",
+            "type": "group",
+            "created": 1331066016571,
+            "modified": 1331066016571,
+            "metadata": {
+                "path": "/groups/a668717b-67cb-11e1-8223-12313d14bde7",
+                "sets": {
+                    "rolenames": "/groups/a668717b-67cb-11e1-8223-12313d14bde7/rolenames",
+                    "permissions": "/groups/a668717b-67cb-11e1-8223-12313d14bde7/permissions"
+                },
+                "collections": {
+                    "activities": "/groups/a668717b-67cb-11e1-8223-12313d14bde7/activities",
+                    "feed": "/groups/a668717b-67cb-11e1-8223-12313d14bde7/feed",
+                    "roles": "/groups/a668717b-67cb-11e1-8223-12313d14bde7/roles",
+                    "users": "/groups/a668717b-67cb-11e1-8223-12313d14bde7/users"
+                }
+            },
+            "path": "mynewgroup"
+        }],
+        "timestamp": 1331066016563,
+        "duration": 35,
+        "organization": "my-org",
+        "applicationName": "my-app"
+    }
+
+## Retrieving groups
+
+Retrieving group data
+
+You can retrieve data about groups through cURL or one of the SDKs. Each provides a way to filter the list of groups by data associated with the group, such as title or path, or other properties in the group entity.
+
+See the [Group Model section of the API Reference](../rest-endpoints/api-docs.html#group) for a list of the system-defined properties for group entities. In addition, you can create group properties specific to your application.
+
+### Request Syntax
+
+    curl -X GET "https://api.usergrid.com/my-org/my-app/groups/mynewgroup"
+    
+Use the GET method to retrieve group data.
+
+### Request URI
+
+    GET /<org_id | uuid>/<app_id | uuid>/groups</groupPath | uuid> | <?ql=query_string>
+
+Parameters
+
+Parameter	Description
+---------
+org_id | uuid	  Organization UUID or organization name
+app_id | uuid	  Application UUID or application name
+groupPath | uuid  Group UUID or group path, which must be unique.
+query_string      A data store query. For more on queries, see Data queries.
+
+### Request
+
+    # Get a group by the group path, "employees/managers".
+    curl -X GET "https://api.usergrid.com/my-org/my-app/groups/employees/managers"
+
+    # Get a group by UUID.
+    curl -X GET "https://api.usergrid.com/my-org/my-app/groups/a407b1e7-58e8-11e1-ac46-22000a1c5a67e"
+
+    # Get group data filtering by their title.
+    curl -X GET "https://api.usergrid.com/my-org/my-app/groups?ql=select%20*%20where%20title%3D'Management%20Employees'"
+
+### Response
+
+The following is an example of JSON returned by a query for a single group.
+
+    {
+        "action" : "get",
+        "application" : "db1e60a0-417f-11e3-9586-0f1ff3650d20",
+        "params" : { },
+        "path" : "/groups",
+        "uri" : "https://api.usergrid.com/steventraut/mynewapp/groups",
+        "entities" : [ {
+            "uuid" : "5005a0fa-6916-11e3-9c1b-b77ec8addc0d",
+            "type" : "group",
+            "created" : 1387503030399,
+            "modified" : 1387503030399,
+            "path" : "managers",
+            "metadata" : {
+                "path" : "/groups/5005a0fa-6916-11e3-9c1b-b77ec8addc0d",
+                "sets" : {
+                    "rolenames" : "/groups/5005a0fa-6916-11e3-9c1b-b77ec8addc0d/roles",
+                    "permissions" : "/groups/5005a0fa-6916-11e3-9c1b-b77ec8addc0d/permissions"
+                },
+                "collections" : {
+                    "activities" : "/groups/5005a0fa-6916-11e3-9c1b-b77ec8addc0d/activities",
+                    "feed" : "/groups/5005a0fa-6916-11e3-9c1b-b77ec8addc0d/feed",
+                    "roles" : "/groups/5005a0fa-6916-11e3-9c1b-b77ec8addc0d/roles",
+                    "users" : "/groups/5005a0fa-6916-11e3-9c1b-b77ec8addc0d/users"
+                }
+            },
+            "title" : "Management Employees"
+        } ],
+        "timestamp" : 1391020491701,
+        "duration" : 15,
+        "organization" : "my-org",
+        "applicationName" : "my-app"
+    }
+
+## Retrieving a group's users
+
+Use the GET method to retrieve all the users in a group.
+
+### Request URI
+
+    GET /{org_id}/{app_id}/groups/{uuid|groupname}/users
+    
+### Parameters
+
+Parameter	               Description
+---------                  --------------
+arg uuid|string org_id     Organization UUID or organization name
+arg uuid|string app_id     Application UUID or application name
+arg uuid|string groupname  UUID or name of the group
+
+### Example - Request
+
+    curl -X GET "https://api.usergrid.com/my-org/my-app/groups/mygroup/users"
+
+### Example - Response
+
+    {
+      "action" : "get",
+      "application" : "e7127751-6985-11e2-8078-02e81aeb2129",
+      "params" : { },
+      "path" : "/groups/d20976ff-802f-11e2-b690-02e81ae66238/users",
+      "uri" : "http://api.usergrid.com/myorg/sandbox/groups/d20976ff-802f-11e2-b690-02e81ae61238/users",
+      "entities" : [ {
+        "uuid" : "cd789b00-698b-11e2-a6e3-02e81ae236e9",
+        "type" : "user",
+        "name" : "barney",
+        "created" : 1359405994314,
+        "modified" : 1361894320470,
+        "activated" : true,
+        "email" : "barney@apigee.com",
+        "metadata" : {
+          "path" : "/groups/d20976ff-802f-11e2-b690-02e81ae66238/users/cd789b00-698b-11e2-a6e3-02e81aeb26e9",
+          "sets" : {
+            "rolenames" : "/groups/d20976ff-802f-11e2-b690-02e81ae66238/users/cd789b00-698b-11e2-a6e3-02e81aeb26e9/rolenames",
+            "permissions" : "/groups/d20976ff-802f-11e2-b690-02e81ae66238/users/cd789b00-698b-11e2-a6e3-02e81aeb26e9/permissions"
+          },
+          "collections" : {
+            "activities" : "/groups/d20976ff-802f-11e2-b690-02e81ae66238/users/cd789b00-698b-11e2-a6e3-02e81aeb26e9/activities",
+            "devices" : "/groups/d20976ff-802f-11e2-b690-02e81ae66238/users/cd789b00-698b-11e2-a6e3-02e81aeb26e9/devices",
+            "feed" : "/groups/d20976ff-802f-11e2-b690-02e81ae66238/users/cd789b00-698b-11e2-a6e3-02e81aeb26e9/feed",
+            "groups" : "/groups/d20976ff-802f-11e2-b690-02e81ae66238/users/cd789b00-698b-11e2-a6e3-02e81aeb26e9/groups",
+            "roles" : "/groups/d20976ff-802f-11e2-b690-02e81ae66238/users/cd789b00-698b-11e2-a6e3-02e81aeb26e9/roles",
+            "following" : "/groups/d20976ff-802f-11e2-b690-02e81ae66238/users/cd789b00-698b-11e2-a6e3-02e81aeb26e9/following",
+            "followers" : "/groups/d20976ff-802f-11e2-b690-02e81ae66238/users/cd789b00-698b-11e2-a6e3-02e81aeb26e9/followers"
+          }
+        },
+        "name" : "barney",
+        "picture" : "http://www.gravatar.com/avatar/00767101f6b4f2cf5d02ed510dbcf0b4",
+        "test" : "fred",
+        "username" : "barney"
+      } ],
+      "timestamp" : 1361903248398,
+      "duration" : 24,
+      "organization" : "myorg",
+      "applicationName" : "sandbox"
+    }
+
+## Deleting a group
+
+To delete a group, delete the associated group entity as you would any other entity. Note that this will only delete the group. Any entities in the group will be preserved.
+
+For more information and code samples, see [Deleting Data Entities](../data-storage/entities.html#deleting-data-entities).
+
+## Adding a user to a group
+
+See all application entities  
+
+You can add users to groups from client code using cURL commands or one of the SDKs, as described here.
+
+When setting up your application on the server, you might find it easier and more convenient to create and populate groups with the admin portal. There, you can create groups, create roles, and define permission rules that govern user access to data and services in your application. For more information, see Security & token authentication.
+
+Use the POST method to add a user to a group. If the named group does not yet exist, an error message is returned.
+
+### Request syntax
+
+    curl -X POST https://api.usergrid.com/<org_id>/<app_id>/groups/<uuid | groupname>/users/<uuid | username>
+
+### Request URI
+
+    POST /<org_id>/<app_id>/groups/<uuid | groupname>/users/<uuid | username>
+
+Parameters
+
+Parameter                   Description
+---------                   -----------
+arg uuid | string org_id	Organization UUID or organization name
+arg uuid | string app_id	Application UUID or application name
+arg uuid | string groupname	UUID or name of the group
+arg uuid | string username	UUID or username of user
+
+### Example
+
+__Note__: Although not shown in the API examples below, you need to provide a valid access token with each API call. See Authenticating users and application clients for details.
+
+### Request
+
+    curl -X POST "https://api.usergrid.com/my-org/my-app/groups/mynewgroup/users/john.doe"
+
+### Response
+
+    {
+        "action": "post",
+        "application": "7fb8d891-477d-11e1-b2bd-22000a1c4e22",
+        "params": {},
+        "path": "/groups/a668717b-67cb-11e1-8223-12313d14bde7/users",
+        "uri": "https://api.usergrid.com/22000a1c4e22-7fb8d891-477d-11e1-b2bd/7fb8d891-477d-11e1-b2bd-22000a1c4e22/groups/a668717b-67cb-11e1-8223-12313d14bde7/users",
+        "entities": [{
+            "uuid": "6fbc8157-4786-11e1-b2bd-22000a1c4e22",
+            "type": "user",
+            "name": "John Doe",
+            "created": 1327517852364015,
+            "modified": 1327517852364015,
+            "activated": true,
+            "email": "john.doe@mail.com",
+            "metadata": {
+                "connecting": {
+                    "owners":"/groups/a668717b-67cb-11e1-8223-12313d14bde7/users/6fbc8157-4786-11e1-b2bd-22000a1c4e22/connecting/owners"
+                },
+                "path": "/groups/a668717b-67cb-11e1-8223-12313d14bde7/users/6fbc8157-4786-11e1-b2bd-22000a1c4e22",
+                "sets": {
+                    "rolenames": "/groups/a668717b-67cb-11e1-8223-12313d14bde7/users/6fbc8157-4786-11e1-b2bd-22000a1c4e22/rolenames",
+                    "permissions": "/groups/a668717b-67cb-11e1-8223-12313d14bde7/users/6fbc8157-4786-11e1-b2bd-22000a1c4e22/permissions"
+                },
+                "collections":{
+                    "activities":"/groups/a668717b-67cb-11e1-8223-12313d14bde7/users/6fbc8157-4786-11e1-b2bd-22000a1c4e22/activities",
+                    "devices": "/groups/a668717b-67cb-11e1-8223-12313d14bde7/users/6fbc8157-4786-11e1-b2bd-22000a1c4e22/devices",
+                    "feed":"/groups/a668717b-67cb-11e1-8223-12313d14bde7/users/6fbc8157-4786-11e1-b2bd-22000a1c4e22/feed",
+                    "groups": "/groups/a668717b-67cb-11e1-8223-12313d14bde7/users/6fbc8157-4786-11e1-b2bd-22000a1c4e22/groups",
+                    "roles":"/groups/a668717b-67cb-11e1-8223-12313d14bde7/users/6fbc8157-4786-11e1-b2bd-22000a1c4e22/roles",
+                    "following": "/groups/a668717b-67cb-11e1-8223-12313d14bde7/users/6fbc8157-4786-11e1-b2bd-22000a1c4e22/following",
+                    "followers": "/groups/a668717b-67cb-11e1-8223-12313d14bde7/users/6fbc8157-4786-11e1-b2bd-22000a1c4e22/followers"
+                }
+            },
+            "picture": "https://www.gravatar.com/avatar/90f823ba15655b8cc8e3b4d63377576f",
+            "username": "john.doe"
+        }],
+        "timestamp": 1331066031380,
+        "duration": 64,
+        "organization" : "my-org",
+        "applicationName": "my-app"
+    }
+
+## Removing a user from a group
+
+Use the DELETE method to remove a user from the specified group.
+
+### Request syntax
+
+    curl -X DELETE https://api.usergrid.com/<org>/<app>/groups/<group>/users/<user>"
+
+Parameters
+
+Parameter	Description
+---------   -----------
+org	        Organization UUID or organization name
+app	        Application UUID or application name
+group	    UUID or name of the group
+user	    UUID, username or email of user to be deleted
+
+### Example request
+
+    curl -X DELETE https://api.usergrid.com/your-org/your-app/groups/someGroup/users/someUser
+
+### Example response
+
+    {
+      "action" : "delete",
+      "application" : "f34f4222-a166-11e2-a7f7-02e81adcf3d0",
+      "params" : { },
+      "path" : "/groups/cd796d0a-b90c-11e3-83de-83ceb9965c26/users",
+      "uri" : "https://api.usergrid.com/your-org/your-app/groups/cd796d0a-b90c-11e3-83de-83ceb9965c26/users",
+      "entities" : [ {
+        "uuid" : "74d2d7da-e694-11e3-b0c6-4d2664c8e0c3",
+        "type" : "user",
+        "name" : "someUser",
+        "created" : 1401301104077,
+        "modified" : 1401301104077,
+        "username" : "someUser",
+        "email" : "your-org@apigee.com",
+        "activated" : true,
+        "picture" : "http://www.gravatar.com/avatar/0455fc92de2636fc7a176cc5d298bb78",
+        "metadata" : {
+          "path" : "/groups/cd796d0a-b90c-11e3-83de-83ceb9965c26/users/74d2d7da-e694-11e3-b0c6-4d2664c8e0c3",
+          "sets" : {
+            "rolenames" : "/groups/cd796d0a-b90c-11e3-83de-83ceb9965c26/users/74d2d7da-e694-11e3-b0c6-4d2664c8e0c3/roles",
+            "permissions" : "/groups/cd796d0a-b90c-11e3-83de-83ceb9965c26/users/74d2d7da-e694-11e3-b0c6-4d2664c8e0c3/permissions"
+          },
+          "collections" : {
+            "activities" : "/groups/cd796d0a-b90c-11e3-83de-83ceb9965c26/users/74d2d7da-e694-11e3-b0c6-4d2664c8e0c3/activities",
+            "devices" : "/groups/cd796d0a-b90c-11e3-83de-83ceb9965c26/users/74d2d7da-e694-11e3-b0c6-4d2664c8e0c3/devices",
+            "feed" : "/groups/cd796d0a-b90c-11e3-83de-83ceb9965c26/users/74d2d7da-e694-11e3-b0c6-4d2664c8e0c3/feed",
+            "groups" : "/groups/cd796d0a-b90c-11e3-83de-83ceb9965c26/users/74d2d7da-e694-11e3-b0c6-4d2664c8e0c3/groups",
+            "roles" : "/groups/cd796d0a-b90c-11e3-83de-83ceb9965c26/users/74d2d7da-e694-11e3-b0c6-4d2664c8e0c3/roles",
+            "following" : "/groups/cd796d0a-b90c-11e3-83de-83ceb9965c26/users/74d2d7da-e694-11e3-b0c6-4d2664c8e0c3/following",
+            "followers" : "/groups/cd796d0a-b90c-11e3-83de-83ceb9965c26/users/74d2d7da-e694-11e3-b0c6-4d2664c8e0c3/followers"
+          }
+        }
+      } ],
+      "timestamp" : 1401751485776,
+      "duration" : 220,
+      "organization" : "your-org",
+      "applicationName" : "your-app"
+    }

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/user-management/groups.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/user-management/groups.txt b/content/docs/_sources/user-management/groups.txt
new file mode 100644
index 0000000..04bed26
--- /dev/null
+++ b/content/docs/_sources/user-management/groups.txt
@@ -0,0 +1,38 @@
+# Groups
+
+You can organize app users into groups. Groups have their own Activity Feed, their own permissions and be a useful alternative to Roles, depending on how you model your data. Groups were originaly designed to emulate Facebook Groups, so they will tend to function about the same way Facebook Groups would.
+
+Groups are hierarchical. Every member of the group /groups/california/san-francisco is also a member of the group /groups/california.
+
+Groups are also a great way to model things such a topic subscriptions. For example, you could allow people to subscribe (i.e. become a member of the group and be alerted via Activities) to /groups/memes/dogs/doge or subscribe to all /groups/memes/dogs
+
+
+### General properties
+
+  Property   Type     Description
+  ---------- -------- ---------------------------------------------------------------------------------
+  uuid       UUID     Group’s unique entity ID
+  type       string   Type of entity, in this case “user”
+  created    long     [UNIX timestamp](http://en.wikipedia.org/wiki/Unix_time) of entity creation
+  modified   long     [UNIX timestamp](http://en.wikipedia.org/wiki/Unix_time) of entity modification
+  path       string   Valid slash-delimited group path (mandatory)
+  title      string   Display name
+
+### Set properties
+
+  Set           Type     Description
+  ------------- -------- ---------------------------------------
+  connections   string   Set of connection types (e.g., likes)
+  rolenames     string   Set of roles assigned to a group
+  credentials   string   Set of group credentials
+
+### Collections
+
+  Collection   Type       Description
+  ------------ ---------- ------------------------------------------------------
+  users        user       Collection of users in the group
+  activities   activity   Collection of activities a user has performed
+  feed         activity   Inbox of activity notifications a group has received
+  roles        role       Set of roles to which a group belongs
+
+ 

[22/60] [abbrv] incubator-usergrid git commit: cherry picking docs from master

[sn...@apache.org]

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/data-queries/querying-your-data.html
----------------------------------------------------------------------
diff --git a/content/docs/data-queries/querying-your-data.html b/content/docs/data-queries/querying-your-data.html
new file mode 100644
index 0000000..6a618a1
--- /dev/null
+++ b/content/docs/data-queries/querying-your-data.html
@@ -0,0 +1,453 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>Querying your data &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+        <link rel="next" title="Query parameters &amp; clauses" href="query-parameters.html"/>
+        <link rel="prev" title="Entities" href="../data-storage/entities.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul class="current">
+<li class="toctree-l1 current"><a class="current reference internal" href="">Querying your data</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#basic-query-usage">Basic query usage</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#request-syntax">Request Syntax</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#retrieving-values-for-multiple-properties">Retrieving values for multiple properties</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#response-syntax">Response syntax</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>Querying your data</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/data-queries/querying-your-data.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="querying-your-data">
+<h1>Querying your data<a class="headerlink" href="#querying-your-data" title="Permalink to this headline">¶</a></h1>
+<p>This article describes how to use queries to filter data retrieved from
+your backend data store. Queries allow you to work with only the data
+you need, making your app more efficient and manageable by reducing the
+number of entities returned or acted on by the API. A query can be sent
+with any GET, PUT or DELETE request. For example, you might query the
+API to retrieve only the user entities with the property status:&#8217;active&#8217;
+to get a list of your users that have active accounts.</p>
+<p>For information on more advanced query usage and syntax, see <a class="reference external" href="query-parameters.html">Query
+parameters &amp; clauses</a>.</p>
+<div class="admonition note"> <p class="first admonition-title"><p>Note</p>
+  </p> <p class="last">
+
+
+Query examples in this content are shown unencoded to make them easier<p>to read. Keep in mind that you might need to encode query strings if
+you&#8217;re sending them as part of URLs, such as when you&#8217;re executing them
+with the cURL tool.</p>
+</p></div><div class="section" id="basic-query-usage">
+<h2>Basic query usage<a class="headerlink" href="#basic-query-usage" title="Permalink to this headline">¶</a></h2>
+<p>The following examples show how to query the Usergrid API to return the
+first 5 entities in the users collection that contain the property
+status:&#8217;active&#8217;.</p>
+<div class="admonition note"> <p class="first admonition-title"><p>Note</p>
+  </p> <p class="last">
+
+
+Optimizing queries: As a best practice, you should include no more<p>than 3 parameters in your queries. The API will not prevent you from
+submitting a query with more than 3 parameters; however, due to the
+nature of NoSQL, queries with many parameters can quickly become very
+inefficient.</p>
+</p></div><p>For more information, see our <a class="reference external" href="../data-store/data-storage-dbms.html">Usergrid DBMS
+overview</a> and <a class="reference external" href="../data-storage/optimizing-access">Data store best
+practices</a>.</p>
+<div class="section" id="request-syntax">
+<h3>Request Syntax<a class="headerlink" href="#request-syntax" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>https://api.usergrid.com/&lt;org&gt;/&lt;app&gt;/&lt;collection&gt;?ql=&lt;query_statement&gt;
+</pre></div>
+</div>
+<p>Note: Any values specified in the query statement should be enclosed in
+single-quotes.</p>
+<div class="highlight-python"><div class="highlight"><pre>https://api.usergrid.com/your-org/your-app/users?limit=5&amp;ql=select * where status = &#39;active&#39;
+</pre></div>
+</div>
+<p>Alternatively, when you use a statement that starts select * where you
+can omit the first part of the statement and abbreviate it this way:</p>
+<div class="highlight-python"><div class="highlight"><pre>https://api.usergrid.com/your-org/your-app/users?limit=5&amp;ql=status = &#39;active&#39;
+</pre></div>
+</div>
+</div>
+<div class="section" id="retrieving-values-for-multiple-properties">
+<h3>Retrieving values for multiple properties<a class="headerlink" href="#retrieving-values-for-multiple-properties" title="Permalink to this headline">¶</a></h3>
+<p>Your query can return multiple kinds of values &#8211; such as the values of
+multiple properties &#8211; by specifying the property names in your select
+statement as a comma-separated list.</p>
+<p>For example, the following request returns the address and phone number
+of users whose name is Gladys Kravitz:</p>
+<div class="highlight-python"><div class="highlight"><pre>/users?ql=select address,phone_number where name = &#39;Gladys Kravitz&#39;
+</pre></div>
+</div>
+</div>
+<div class="section" id="response-syntax">
+<h3>Response syntax<a class="headerlink" href="#response-syntax" title="Permalink to this headline">¶</a></h3>
+<p>When you query your data, the API response is formatted in JavaScript
+Object Notation (JSON). This is a common format used for parameter and
+return values in REST web services.</p>
+<p>Data corresponding to the response is captured in the response’s
+entities array. The array will include one JSON-object for each entity
+returned for the query. Each returned entity will include a number of
+default properties, including the UUID of the entity, the entity type,
+and values for properties such as name, username, email, and so on. For
+a complete list of default properties by entity type, see Default Data
+Entity Types.</p>
+<p>For example, the following query for all entities of type user where the
+name property equals &#8216;Gladys Kravitz&#8217;:</p>
+<div class="highlight-python"><div class="highlight"><pre>/users?ql=select * where name = ‘Gladys Kravitz’
+</pre></div>
+</div>
+<p>will return the following response:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+  <span class="s">&quot;action&quot;</span> <span class="p">:</span> <span class="s">&quot;get&quot;</span><span class="p">,</span>
+  <span class="s">&quot;application&quot;</span> <span class="p">:</span> <span class="s">&quot;8272c9b0-d86a-11e2-92e2-cdf1ce04c1c0&quot;</span><span class="p">,</span>
+  <span class="s">&quot;params&quot;</span> <span class="p">:</span> <span class="p">{</span>
+    <span class="s">&quot;ql&quot;</span> <span class="p">:</span> <span class="p">[</span> <span class="s">&quot;select * where name = &#39;Gladys Kravitz&#39;&quot;</span> <span class="p">]</span>
+  <span class="p">},</span>
+  <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span class="s">&quot;/users&quot;</span><span class="p">,</span>
+  <span class="s">&quot;uri&quot;</span> <span class="p">:</span> <span class="s">&quot;http://api.usergrid.com/myorg/myapp/users&quot;</span><span class="p">,</span>
+  <span class="s">&quot;entities&quot;</span> <span class="p">:</span> <span class="p">[</span> <span class="p">{</span>
+    <span class="s">&quot;uuid&quot;</span> <span class="p">:</span> <span class="s">&quot;d0d7d0ba-e97b-11e2-8cef-411c466c4f2c&quot;</span><span class="p">,</span>
+    <span class="s">&quot;type&quot;</span> <span class="p">:</span> <span class="s">&quot;user&quot;</span><span class="p">,</span>
+    <span class="s">&quot;name&quot;</span> <span class="p">:</span> <span class="s">&quot;Gladys Kravitz&quot;</span><span class="p">,</span>
+    <span class="s">&quot;created&quot;</span> <span class="p">:</span> <span class="mi">1373472876859</span><span class="p">,</span>
+    <span class="s">&quot;modified&quot;</span> <span class="p">:</span> <span class="mi">1373472876859</span><span class="p">,</span>
+    <span class="s">&quot;username&quot;</span> <span class="p">:</span> <span class="s">&quot;gladys&quot;</span><span class="p">,</span>
+    <span class="s">&quot;email&quot;</span> <span class="p">:</span> <span class="s">&quot;gladys@example.com&quot;</span><span class="p">,</span>
+    <span class="s">&quot;activated&quot;</span> <span class="p">:</span> <span class="n">true</span><span class="p">,</span>
+    <span class="s">&quot;picture&quot;</span> <span class="p">:</span> <span class="s">&quot;http://www.gravatar.com/avatar/20c57d4f41cf51f2db44165eb058b3b2&quot;</span><span class="p">,</span>
+    <span class="s">&quot;metadata&quot;</span> <span class="p">:</span> <span class="p">{</span>
+      <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/d0d7d0ba-e97b-11e2-8cef-411c466c4f2c&quot;</span><span class="p">,</span>
+      <span class="s">&quot;sets&quot;</span> <span class="p">:</span> <span class="p">{</span>
+        <span class="s">&quot;rolenames&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/d0d7d0ba-e97b-11e2-8cef-411c466c4f2c/rolenames&quot;</span><span class="p">,</span>
+        <span class="s">&quot;permissions&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/d0d7d0ba-e97b-11e2-8cef-411c466c4f2c/permissions&quot;</span>
+      <span class="p">},</span>
+      <span class="s">&quot;connections&quot;</span> <span class="p">:</span> <span class="p">{</span>
+        <span class="s">&quot;firstname&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/d0d7d0ba-e97b-11e2-8cef-411c466c4f2c/firstname&quot;</span><span class="p">,</span>
+        <span class="s">&quot;lastname&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/d0d7d0ba-e97b-11e2-8cef-411c466c4f2c/lastname&quot;</span>
+      <span class="p">},</span>
+      <span class="s">&quot;collections&quot;</span> <span class="p">:</span> <span class="p">{</span>
+        <span class="s">&quot;activities&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/d0d7d0ba-e97b-11e2-8cef-411c466c4f2c/activities&quot;</span><span class="p">,</span>
+        <span class="s">&quot;users&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/d0d7d0ba-e97b-11e2-8cef-411c466c4f2c/users&quot;</span><span class="p">,</span>
+        <span class="s">&quot;feed&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/d0d7d0ba-e97b-11e2-8cef-411c466c4f2c/feed&quot;</span><span class="p">,</span>
+        <span class="s">&quot;groups&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/d0d7d0ba-e97b-11e2-8cef-411c466c4f2c/groups&quot;</span><span class="p">,</span>
+        <span class="s">&quot;roles&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/d0d7d0ba-e97b-11e2-8cef-411c466c4f2c/roles&quot;</span><span class="p">,</span>
+        <span class="s">&quot;following&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/d0d7d0ba-e97b-11e2-8cef-411c466c4f2c/following&quot;</span><span class="p">,</span>
+        <span class="s">&quot;followers&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/d0d7d0ba-e97b-11e2-8cef-411c466c4f2c/followers&quot;</span>
+      <span class="p">}</span>
+    <span class="p">}</span>
+  <span class="p">}</span> <span class="p">],</span>
+  <span class="s">&quot;timestamp&quot;</span> <span class="p">:</span> <span class="mi">1374694196061</span><span class="p">,</span>
+  <span class="s">&quot;duration&quot;</span> <span class="p">:</span> <span class="mi">48</span><span class="p">,</span>
+  <span class="s">&quot;organization&quot;</span> <span class="p">:</span> <span class="s">&quot;myorg&quot;</span><span class="p">,</span>
+  <span class="s">&quot;applicationName&quot;</span> <span class="p">:</span> <span class="s">&quot;myapp&quot;</span><span class="p">,</span>
+  <span class="s">&quot;count&quot;</span> <span class="p">:</span> <span class="mi">1</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+<p>Compare the preceding example with the following for another kind of
+query. Imagine the following request string, where the query string is
+asking for only the values of two of the entity’s properties (username
+and name):</p>
+<div class="highlight-python"><div class="highlight"><pre>/users?ql=select username,name where name=’Gladys Kravitz’
+</pre></div>
+</div>
+<p>In the response JSON from this query, the return value is specified as
+the property of the list item &#8211; here, an array containing only the
+values of the properties the query asked for, in the order they were
+requested (username first, then name).</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+  <span class="s">&quot;action&quot;</span> <span class="p">:</span> <span class="s">&quot;get&quot;</span><span class="p">,</span>
+  <span class="s">&quot;application&quot;</span> <span class="p">:</span> <span class="s">&quot;8272c9b0-d86a-11e2-92e2-cdf1ce04c1c0&quot;</span><span class="p">,</span>
+  <span class="s">&quot;params&quot;</span> <span class="p">:</span> <span class="p">{</span>
+    <span class="s">&quot;ql&quot;</span> <span class="p">:</span> <span class="p">[</span> <span class="s">&quot;select username,name where name=&#39;Gladys Kravitz&#39;&quot;</span> <span class="p">]</span>
+  <span class="p">},</span>
+  <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span class="s">&quot;/users&quot;</span><span class="p">,</span>
+  <span class="s">&quot;uri&quot;</span> <span class="p">:</span> <span class="s">&quot;http://api.usergrid.com/myorg/myapp/users&quot;</span><span class="p">,</span>
+  <span class="s">&quot;list&quot;</span> <span class="p">:</span> <span class="p">[</span> <span class="p">[</span> <span class="s">&quot;gladys&quot;</span><span class="p">,</span> <span class="s">&quot;Gladys Kravitz&quot;</span> <span class="p">]</span> <span class="p">],</span>
+  <span class="s">&quot;timestamp&quot;</span> <span class="p">:</span> <span class="mi">1374697463190</span><span class="p">,</span>
+  <span class="s">&quot;duration&quot;</span> <span class="p">:</span> <span class="mi">25</span><span class="p">,</span>
+  <span class="s">&quot;organization&quot;</span> <span class="p">:</span> <span class="s">&quot;myorg&quot;</span><span class="p">,</span>
+  <span class="s">&quot;applicationName&quot;</span> <span class="p">:</span> <span class="s">&quot;myapp&quot;</span><span class="p">,</span>
+  <span class="s">&quot;count&quot;</span> <span class="p">:</span> <span class="mi">1</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+</div>
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+      
+        <a href="query-parameters.html" class="btn btn-neutral float-right" title="Query parameters &amp; clauses" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+      
+      
+        <a href="../data-storage/entities.html" class="btn btn-neutral" title="Entities" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+      
+    </div>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/data-storage/collections.html
----------------------------------------------------------------------
diff --git a/content/docs/data-storage/collections.html b/content/docs/data-storage/collections.html
new file mode 100644
index 0000000..ef51089
--- /dev/null
+++ b/content/docs/data-storage/collections.html
@@ -0,0 +1,670 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>Collections &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+        <link rel="next" title="Entities" href="entities.html"/>
+        <link rel="prev" title="Data Store Best Practices" href="optimizing-access.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">Collections</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#creating-collections">Creating Collections</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#creating-a-collection">Creating a collection</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#request-syntax">Request Syntax</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#example-request-response">Example Request/Response</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#retrieving-collections">Retrieving Collections</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#retrieving-sets-of-entities-from-a-collection">Retrieving sets of entities from a collection</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id1">Request Syntax</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id2">Example Request/Response</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#updating-collections">Updating Collections</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#batch-updating-entities-in-a-collection">Batch updating entities in a collection</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id3">Request Syntax</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id4">Example Request/Response</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#deleting-collections">Deleting Collections</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#batch-deleting-entities-in-a-collection">Batch deleting entities in a collection</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id5">Request Syntax</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id6">Example Request/Response</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>Collections</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/data-storage/collections.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="collections">
+<h1>Collections<a class="headerlink" href="#collections" title="Permalink to this headline">¶</a></h1>
+<div class="section" id="creating-collections">
+<h2>Creating Collections<a class="headerlink" href="#creating-collections" title="Permalink to this headline">¶</a></h2>
+<p>This article describes how to create collections in Advanced Usergrid.
+All entities are automatically associated with a corresponding
+collection based on the type property of the entity. You may create
+empty collections if you wish, but creating an entity of a new type will
+automatically create a corresponding collection for you. For example,
+creating a new custom &#8220;item&#8221; entity, creates an &#8220;items&#8221; collection.</p>
+<p><strong>Note</strong>: Although not shown in the API examples below, you need to
+provide a valid access token with each API call. See Authenticating
+users and application clients for details.</p>
+<div class="section" id="creating-a-collection">
+<h3>Creating a collection<a class="headerlink" href="#creating-a-collection" title="Permalink to this headline">¶</a></h3>
+<p>The following example shows how to create an empty collection.
+Alternatively, you can create a collection simply by creating a new
+entity with a &#8216;type&#8217; property that corresponds to the collection you
+wish to create. For more on creating entities, see Creating Custom Data
+Entities</p>
+</div>
+<div class="section" id="request-syntax">
+<h3>Request Syntax<a class="headerlink" href="#request-syntax" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X POST https://api.usergrid.com/&lt;org&gt;/&lt;app&gt;/&lt;collection_name&gt;
+</pre></div>
+</div>
+<p>Parameters</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="31%" />
+<col width="69%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>org</td>
+<td>Organization UUID or organization name</td>
+</tr>
+<tr class="row-odd"><td>app</td>
+<td>Application UUID or application name</td>
+</tr>
+<tr class="row-even"><td>collection name</td>
+<td>Name of the collection to create.</td>
+</tr>
+</tbody>
+</table>
+<p>If the provided value is not a plural word, Usergrid will pluralize it.
+For example, providing &#8216;item&#8217; will create a collection named &#8216;items&#8217; but
+providing &#8216;items&#8217; will not create &#8216;itemses&#8217;.</p>
+</div>
+<div class="section" id="example-request-response">
+<h3>Example Request/Response<a class="headerlink" href="#example-request-response" title="Permalink to this headline">¶</a></h3>
+<p>Request:</p>
+<div class="highlight-python"><div class="highlight"><pre>curl -X POST &quot;https://api.usergrid.com/your-org/your-app/item&quot;
+</pre></div>
+</div>
+<p>Response:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+  <span class="s">&quot;action&quot;</span> <span class="p">:</span> <span class="s">&quot;post&quot;</span><span class="p">,</span>
+  <span class="s">&quot;application&quot;</span> <span class="p">:</span> <span class="s">&quot;f34f4222-a166-11e2-a7f7-02e81adcf3d0&quot;</span><span class="p">,</span>
+  <span class="s">&quot;params&quot;</span> <span class="p">:</span> <span class="p">{</span> <span class="p">},</span>
+  <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span class="s">&quot;/items&quot;</span><span class="p">,</span>
+  <span class="s">&quot;uri&quot;</span> <span class="p">:</span> <span class="s">&quot;http://api.usergrid.com/your-org/your-app/items&quot;</span><span class="p">,</span>
+  <span class="s">&quot;entities&quot;</span> <span class="p">:</span> <span class="p">[</span> <span class="p">],</span>
+  <span class="s">&quot;timestamp&quot;</span> <span class="p">:</span> <span class="mi">1378857079220</span><span class="p">,</span>
+  <span class="s">&quot;duration&quot;</span> <span class="p">:</span> <span class="mi">31</span><span class="p">,</span>
+  <span class="s">&quot;organization&quot;</span> <span class="p">:</span> <span class="s">&quot;your-org&quot;</span><span class="p">,</span>
+  <span class="s">&quot;applicationName&quot;</span> <span class="p">:</span> <span class="s">&quot;your-app&quot;</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+</div>
+<div class="section" id="retrieving-collections">
+<h2>Retrieving Collections<a class="headerlink" href="#retrieving-collections" title="Permalink to this headline">¶</a></h2>
+<p>This article describes how to retrieve all of the entities in a
+collection.</p>
+<div class="admonition note"> <p class="first admonition-title"><p>Note</p>
+</p> <p class="last"><p>By default, the Usergrid API returns 10 entities per request. For
+collections with more than 10 entities, use the returned &#8216;cursor&#8217;
+property to retrieve the next 10 entities in the result set. You may
+also use the LIMIT parameter in a query string to increase the number of
+results returned. For more information on using cursors, see <a class="reference external" href="../data-queries/query-parameters.html">Query
+Parameters</a>.</p>
+</p></div><p><strong>Note</strong>: Although not shown in the API examples below, you need to
+provide a valid access token with each API call. See Authenticating
+users and application clients for details.</p>
+<div class="section" id="retrieving-sets-of-entities-from-a-collection">
+<h3>Retrieving sets of entities from a collection<a class="headerlink" href="#retrieving-sets-of-entities-from-a-collection" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="id1">
+<h3>Request Syntax<a class="headerlink" href="#id1" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X GET https://api.usergrid.com/&lt;org&gt;/&lt;app&gt;/&lt;collection&gt;
+</pre></div>
+</div>
+<p>Parameters</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="25%" />
+<col width="75%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>org</td>
+<td>Organization UUID or organization name</td>
+</tr>
+<tr class="row-odd"><td>app</td>
+<td>Application UUID or application name</td>
+</tr>
+<tr class="row-even"><td>collection</td>
+<td>Collection UUID or collection name</td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="section" id="id2">
+<h3>Example Request/Response<a class="headerlink" href="#id2" title="Permalink to this headline">¶</a></h3>
+<p>Request:</p>
+<div class="highlight-python"><div class="highlight"><pre>curl -X GET &quot;https://api.usergrid.com/your-org/your-app/items&quot;
+</pre></div>
+</div>
+<p>Response:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+      <span class="s">&quot;action&quot;</span> <span class="p">:</span> <span class="s">&quot;get&quot;</span><span class="p">,</span>
+      <span class="s">&quot;application&quot;</span> <span class="p">:</span> <span class="s">&quot;f34f4222-a166-11e2-a7f7-02e81adcf3d0&quot;</span><span class="p">,</span>
+      <span class="s">&quot;params&quot;</span> <span class="p">:</span> <span class="p">{</span> <span class="p">},</span>
+      <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span class="s">&quot;/items&quot;</span><span class="p">,</span>
+      <span class="s">&quot;uri&quot;</span> <span class="p">:</span> <span class="s">&quot;http://api.usergrid.com/your-org/your-app/items&quot;</span><span class="p">,</span>
+      <span class="s">&quot;entities&quot;</span> <span class="p">:</span> <span class="p">[</span> <span class="p">{</span>
+            <span class="s">&quot;uuid&quot;</span> <span class="p">:</span> <span class="s">&quot;5bb76bca-1657-11e3-903f-9ff6c621a7a4&quot;</span><span class="p">,</span>
+            <span class="s">&quot;type&quot;</span> <span class="p">:</span> <span class="s">&quot;item&quot;</span><span class="p">,</span>
+            <span class="s">&quot;name&quot;</span> <span class="p">:</span> <span class="s">&quot;milk&quot;</span><span class="p">,</span>
+            <span class="s">&quot;created&quot;</span> <span class="p">:</span> <span class="mi">1378405020796</span><span class="p">,</span>
+            <span class="s">&quot;modified&quot;</span> <span class="p">:</span> <span class="mi">1378405020796</span><span class="p">,</span>
+            <span class="s">&quot;metadata&quot;</span> <span class="p">:</span> <span class="p">{</span>
+                  <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span class="s">&quot;/items/5bb76bca-1657-11e3-903f-9ff6c621a7a4&quot;</span>
+            <span class="p">},</span>
+            <span class="s">&quot;name&quot;</span> <span class="p">:</span> <span class="s">&quot;milk&quot;</span><span class="p">,</span>
+            <span class="s">&quot;price&quot;</span> <span class="p">:</span> <span class="s">&quot;3.25&quot;</span>
+      <span class="p">},</span> <span class="p">{</span>
+        <span class="s">&quot;uuid&quot;</span> <span class="p">:</span> <span class="s">&quot;1a9356ba-1682-11e3-a72a-81581bbaf055&quot;</span><span class="p">,</span>
+        <span class="s">&quot;type&quot;</span> <span class="p">:</span> <span class="s">&quot;item&quot;</span><span class="p">,</span>
+        <span class="s">&quot;name&quot;</span> <span class="p">:</span> <span class="s">&quot;bread&quot;</span><span class="p">,</span>
+        <span class="s">&quot;created&quot;</span> <span class="p">:</span> <span class="mi">1378423379867</span><span class="p">,</span>
+        <span class="s">&quot;modified&quot;</span> <span class="p">:</span> <span class="mi">1378423379867</span><span class="p">,</span>
+        <span class="s">&quot;metadata&quot;</span> <span class="p">:</span> <span class="p">{</span>
+              <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span class="s">&quot;/items/1a9356ba-1682-11e3-a72a-81581bbaf055&quot;</span>
+        <span class="p">},</span>
+        <span class="s">&quot;name&quot;</span> <span class="p">:</span> <span class="s">&quot;bread&quot;</span><span class="p">,</span>
+        <span class="s">&quot;price&quot;</span> <span class="p">:</span> <span class="s">&quot;2.50&quot;</span>
+      <span class="p">}</span> <span class="p">],</span>
+      <span class="s">&quot;timestamp&quot;</span> <span class="p">:</span> <span class="mi">1378426821261</span><span class="p">,</span>
+      <span class="s">&quot;duration&quot;</span> <span class="p">:</span> <span class="mi">35</span><span class="p">,</span>
+      <span class="s">&quot;organization&quot;</span> <span class="p">:</span> <span class="s">&quot;your-org&quot;</span><span class="p">,</span>
+      <span class="s">&quot;applicationName&quot;</span> <span class="p">:</span> <span class="s">&quot;your-app&quot;</span><span class="p">,</span>
+      <span class="s">&quot;count&quot;</span> <span class="p">:</span> <span class="mi">2</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+</div>
+<div class="section" id="updating-collections">
+<h2>Updating Collections<a class="headerlink" href="#updating-collections" title="Permalink to this headline">¶</a></h2>
+<p>This article describes how to perform batch updates on all entities in a
+collection. Batch updates require the use of a query string in the
+request, which can either specify all entities in the collection or a
+subset of entities for the update to be performed on. For more
+information on queries, see Querying your data.</p>
+<p><strong>Note</strong>: Although not shown in the API examples below, you need to
+provide a valid access token with each API call. See Authenticating
+users and application clients for details.</p>
+<div class="section" id="batch-updating-entities-in-a-collection">
+<h3>Batch updating entities in a collection<a class="headerlink" href="#batch-updating-entities-in-a-collection" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="id3">
+<h3>Request Syntax<a class="headerlink" href="#id3" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X PUT https://api.usergrid.com/&lt;org&gt;/&lt;app&gt;/&lt;collection&gt;/?ql= -d {&lt;property&gt;}
+</pre></div>
+</div>
+<p>Note the empty query string (ql=) appended to the URL.</p>
+<p>Parameters</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="23%" />
+<col width="77%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>org</td>
+<td>Organization UUID or organization name</td>
+</tr>
+<tr class="row-odd"><td>app</td>
+<td>Application UUID or application name</td>
+</tr>
+<tr class="row-even"><td>collection</td>
+<td>Collection UUID or collection name property</td>
+</tr>
+</tbody>
+</table>
+<p>An entity property to be updated, formatted as a key-value pair. For
+example:</p>
+<div class="highlight-python"><div class="highlight"><pre>{&quot;property_1&quot;:&quot;value_1&quot;, &quot;property_2&quot;:&quot;value_2&quot;,...}
+</pre></div>
+</div>
+</div>
+<div class="section" id="id4">
+<h3>Example Request/Response<a class="headerlink" href="#id4" title="Permalink to this headline">¶</a></h3>
+<p>Request:</p>
+<div class="highlight-python"><div class="highlight"><pre>curl -X PUT https://api.usergrid.com/your-org/your-app/items/?ql= -d &#39;{&quot;availability&quot;:&quot;in-stock&quot;}&#39;
+</pre></div>
+</div>
+<p>Note the empty ?ql= query string.</p>
+<p>Response:</p>
+<div class="highlight-python"><div class="highlight"><pre>{
+  &quot;action&quot; : &quot;put&quot;,
+  &quot;application&quot; : &quot;f34f4222-a166-11e2-a7f7-02e81adcf3d0&quot;,
+  &quot;params&quot; : {
+    &quot;ql&quot; : [ &quot;&quot; ]
+  },
+  &quot;path&quot; : &quot;/items&quot;,
+  &quot;uri&quot; : &quot;http://api.usergrid.com/your-org/your-app/items&quot;,
+  &quot;entities&quot; : [ {
+    &quot;uuid&quot; : &quot;31847b9a-1a62-11e3-be04-8d05e96f700d&quot;,
+    &quot;type&quot; : &quot;item&quot;,
+    &quot;name&quot; : &quot;milk&quot;,
+    &quot;price&quot; : &quot;3.25&quot;,
+    &quot;availability&quot; : &quot;in-stock&quot;
+    &quot;created&quot; : 1378849479113,
+    &quot;modified&quot; : 1378849567301,
+    &quot;name&quot; : &quot;milk&quot;,
+  }, {
+    &quot;uuid&quot; : &quot;3192ac6a-1a62-11e3-a24f-496ca1d42ce7&quot;,
+    &quot;type&quot; : &quot;item&quot;,
+    &quot;name&quot; : &quot;bread&quot;,
+    &quot;price&quot; : &quot;4.00&quot;,
+    &quot;availability&quot; : &quot;in-stock&quot;
+    &quot;created&quot; : 1378849479206,
+    &quot;modified&quot; : 1378849567351,
+    &quot;name&quot; : &quot;bread&quot;,
+  } ],
+  &quot;timestamp&quot; : 1378849567280,
+  &quot;duration&quot; : 207,
+  &quot;organization&quot; : &quot;your-org&quot;,
+  &quot;applicationName&quot; : &quot;your-app&quot;
+}
+</pre></div>
+</div>
+</div>
+</div>
+<div class="section" id="deleting-collections">
+<h2>Deleting Collections<a class="headerlink" href="#deleting-collections" title="Permalink to this headline">¶</a></h2>
+<p>This article describes how to batch delete entities in a collection.
+Batch deletes require the use of a query string in the request, which
+specifies a subset of entities to be deleted. For more information on
+queries, see Querying your data.</p>
+<p>Currently, collections cannot be deleted; however, you can delete all of
+the entities from a collection.</p>
+<p><strong>Note</strong>: Although not shown in the API examples below, you need to
+provide a valid access token with each API call. See Authenticating
+users and application clients for details.</p>
+<div class="section" id="batch-deleting-entities-in-a-collection">
+<h3>Batch deleting entities in a collection<a class="headerlink" href="#batch-deleting-entities-in-a-collection" title="Permalink to this headline">¶</a></h3>
+</div>
+<div class="section" id="id5">
+<h3>Request Syntax<a class="headerlink" href="#id5" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X DELETE https://api.usergrid.com/&lt;org&gt;/&lt;app&gt;/&lt;collection&gt;/?ql=&lt;query&gt;
+</pre></div>
+</div>
+<p>Parameters</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="18%" />
+<col width="83%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>org</td>
+<td>Organization UUID or organization name</td>
+</tr>
+<tr class="row-odd"><td>app</td>
+<td>Application UUID or application name</td>
+</tr>
+<tr class="row-even"><td>collection</td>
+<td>Collection UUID or collection name</td>
+</tr>
+<tr class="row-odd"><td>query</td>
+<td>A query string that specifies the subset of entities to delete</td>
+</tr>
+</tbody>
+</table>
+<p>(for more information on queries, see Querying your data)</p>
+</div>
+<div class="section" id="id6">
+<h3>Example Request/Response<a class="headerlink" href="#id6" title="Permalink to this headline">¶</a></h3>
+<p>The following example will delete the first 5 entities in a collection.</p>
+<p>Request:</p>
+<div class="highlight-python"><div class="highlight"><pre>curl -X DELETE https://api.usergrid.com/your-org/your-app/items/?ql=&quot;limit=5&quot;
+</pre></div>
+</div>
+<p>Response:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+  <span class="s">&quot;action&quot;</span> <span class="p">:</span> <span class="s">&quot;delete&quot;</span><span class="p">,</span>
+  <span class="s">&quot;application&quot;</span> <span class="p">:</span> <span class="s">&quot;f34f4222-a166-11e2-a7f7-02e81adcf3d0&quot;</span><span class="p">,</span>
+  <span class="s">&quot;params&quot;</span> <span class="p">:</span> <span class="p">{</span>
+    <span class="s">&quot;ql&quot;</span> <span class="p">:</span> <span class="p">[</span> <span class="s">&quot;&quot;</span> <span class="p">]</span>
+  <span class="p">},</span>
+  <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span class="s">&quot;/items&quot;</span><span class="p">,</span>
+  <span class="s">&quot;uri&quot;</span> <span class="p">:</span> <span class="s">&quot;http://api.usergrid.com/your-org/your-app/items&quot;</span><span class="p">,</span>
+  <span class="s">&quot;entities&quot;</span> <span class="p">:</span> <span class="p">[</span> <span class="p">{</span>
+    <span class="s">&quot;uuid&quot;</span> <span class="p">:</span> <span class="s">&quot;53fe3700-0abe-11e3-b1f7-1bd100b8059e&quot;</span><span class="p">,</span>
+    <span class="s">&quot;type&quot;</span> <span class="p">:</span> <span class="s">&quot;item&quot;</span><span class="p">,</span>
+    <span class="s">&quot;name&quot;</span> <span class="p">:</span> <span class="s">&quot;milk&quot;</span><span class="p">,</span>
+    <span class="s">&quot;price&quot;</span> <span class="p">:</span> <span class="s">&quot;3.25&quot;</span><span class="p">,</span>
+    <span class="s">&quot;created&quot;</span> <span class="p">:</span> <span class="mi">1377129832047</span><span class="p">,</span>
+    <span class="s">&quot;modified&quot;</span> <span class="p">:</span> <span class="mi">1377129832047</span><span class="p">,</span>
+    <span class="s">&quot;metadata&quot;</span> <span class="p">:</span> <span class="p">{</span>
+      <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span class="s">&quot;/items/53fe3700-0abe-11e3-b1f7-1bd100b8059e&quot;</span>
+    <span class="p">},</span>
+    <span class="s">&quot;name&quot;</span> <span class="p">:</span> <span class="s">&quot;milk&quot;</span>
+  <span class="p">},</span> <span class="p">{</span>
+    <span class="s">&quot;uuid&quot;</span> <span class="p">:</span> <span class="s">&quot;5ae1fa7a-0abe-11e3-89ab-6be0003c809b&quot;</span><span class="p">,</span>
+    <span class="s">&quot;type&quot;</span> <span class="p">:</span> <span class="s">&quot;item&quot;</span><span class="p">,</span>
+    <span class="s">&quot;name&quot;</span> <span class="p">:</span> <span class="s">&quot;bread&quot;</span><span class="p">,</span>
+    <span class="s">&quot;price&quot;</span> <span class="p">:</span> <span class="s">&quot;4.00&quot;</span><span class="p">,</span>
+    <span class="s">&quot;created&quot;</span> <span class="p">:</span> <span class="mi">1377129843607</span><span class="p">,</span>
+    <span class="s">&quot;modified&quot;</span> <span class="p">:</span> <span class="mi">1377129843607</span><span class="p">,</span>
+    <span class="s">&quot;metadata&quot;</span> <span class="p">:</span> <span class="p">{</span>
+      <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span class="s">&quot;/items/5ae1fa7a-0abe-11e3-89ab-6be0003c809b&quot;</span>
+    <span class="p">},</span>
+    <span class="s">&quot;name&quot;</span> <span class="p">:</span> <span class="s">&quot;bread&quot;</span>
+  <span class="p">}</span> <span class="p">],</span>
+  <span class="s">&quot;timestamp&quot;</span> <span class="p">:</span> <span class="mi">1378848117272</span><span class="p">,</span>
+  <span class="s">&quot;duration&quot;</span> <span class="p">:</span> <span class="mi">12275</span><span class="p">,</span>
+  <span class="s">&quot;organization&quot;</span> <span class="p">:</span> <span class="s">&quot;your-org&quot;</span><span class="p">,</span>
+  <span class="s">&quot;applicationName&quot;</span> <span class="p">:</span> <span class="s">&quot;your-app&quot;</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+</div>
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+      
+        <a href="entities.html" class="btn btn-neutral float-right" title="Entities" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+      
+      
+        <a href="optimizing-access.html" class="btn btn-neutral" title="Data Store Best Practices" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+      
+    </div>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/data-storage/data-store-dbms.html
----------------------------------------------------------------------
diff --git a/content/docs/data-storage/data-store-dbms.html b/content/docs/data-storage/data-store-dbms.html
new file mode 100644
index 0000000..f30c742
--- /dev/null
+++ b/content/docs/data-storage/data-store-dbms.html
@@ -0,0 +1,423 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>The Usergrid Data Store &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+        <link rel="next" title="Data Store Best Practices" href="optimizing-access.html"/>
+        <link rel="prev" title="Using the API" href="../getting-started/using-the-api.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul class="current">
+<li class="toctree-l1 current"><a class="current reference internal" href="">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>The Usergrid Data Store</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/data-storage/data-store-dbms.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="the-usergrid-data-store">
+<h1>The Usergrid Data Store<a class="headerlink" href="#the-usergrid-data-store" title="Permalink to this headline">¶</a></h1>
+<p>The Usergrid data store is backed by Cassandra, an open source
+distributed DBMS. Cassandra isn’t a relational database system (RDBMS),
+and is sometimes placed in the category of “NoSQL” or “schema-less”
+databases.</p>
+<!-- workaround a Sphinx bug -->
+<div class="admonition note"> <p class="first admonition-title"><p>Note</p>
+</p> <p class="last"><p>Usergrid is not a relational database. Optimizing for performance on a
+non-relational database like Cassandra differs a bit from relational
+databases. For more information, see Optimizing access to your Usergrid
+data store.</p>
+</p> </div><p>Cassandra is specifically designed to support applications that need
+flexibility and high scalability, particularly web and mobile
+applications. Usergrid client applications write and read data formatted
+as JavaScript Object Notation (JSON). (Usergrid provides SDKs through
+which client apps can do much of this work in their native language. For
+more information, see Usergrid SDKs.)</p>
+<p>With Cassandra as the underlying DBMS, apps benefit from:</p>
+<p>Fast writes to the data store. * A distributed architecture that means
+no single point of failure. * Flexibility in data model design. You
+aren&#8217;t constrained by a schema. * Linear scalability.</p>
+<p>If you have experience with relational databases and are unfamiliar with
+&#8220;NoSQL&#8221; databases, the following table might be a helpful start. It maps
+the high-level concepts of an RDBMS’s data model both to Cassandra’s and
+to the Usergrid, which is backed by Cassandra.</p>
+<table class="usergrid-table">
+<tr>
+    <td></td>
+    <td><p>RDBMS</p>
+</td>
+    <td><p>Cassandra</p>
+</td>
+    <td><p>Usergrid</p>
+</td>
+</tr>
+<tr>
+    <td><p>Each tuple is modeled as</p>
+</td>
+    <td><p>A row.</p>
+</td>
+    <td><p>A row.</p>
+</td>
+    <td><p>An entity. Written and retrieved as JSON, an entity contains values for
+all of its properties in the way a row has values for columns.</p>
+</td>
+</tr>
+<tr>
+    <td><p>Each data attribute is modeled as</p>
+</td>
+    <td><p>A column.</p>
+</td>
+    <td><p>A column. Many thousands of columns are supported.</p>
+</td>
+    <td><p>A entity property. An entity has a default set of properties, including
+the entity’s UUID. You can add many more to support your application.</p>
+</td>
+</tr>
+<tr>
+    <td><p>Each group of attributes is modeled as</p>
+</td>
+    <td><p>A table.</p>
+</td>
+    <td><p>A column family. Unlike rows in tables, rows in a column family can have
+differing numbers of columns. Because you’re not using a schema to
+define the model, you can update the column list for a row at any time.</p>
+</td>
+    <td><p>An entity collection. As with its underlying Cassandra column family, a
+collection can have entities with differing numbers of properties. In
+other words, just because one entity has an authorId property doesn’t
+mean that other entities in its collection need to.</p>
+</td>
+</tr>
+</table><p>The following examples from a product database provide simple
+illustrations of these differences.</p>
+<p>An RDBMS table has a schema-defined set of columns per row.</p>
+<img alt="../_images/rdbms.png" src="../_images/rdbms.png" />
+<p>A Cassandra column family includes rows that can have differing column
+sets.</p>
+<img alt="../_images/cassandra.png" src="../_images/cassandra.png" />
+<p>In the JSON from the Usergrid application, the products are represented
+as entities. Note that each entity in the entities array below has a
+slightly different set of properties, like the columns in a Cassandra
+column family.</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+    <span class="s">&quot;action&quot;</span> <span class="p">:</span> <span class="s">&quot;get&quot;</span><span class="p">,</span>
+    <span class="s">&quot;application&quot;</span> <span class="p">:</span> <span class="s">&quot;&lt;app_uuid&gt;&quot;</span><span class="p">,</span>
+    <span class="s">&quot;params&quot;</span> <span class="p">:</span> <span class="p">{},</span>
+    <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span class="s">&quot;/products&quot;</span><span class="p">,</span>
+    <span class="s">&quot;uri&quot;</span> <span class="p">:</span> <span class="s">&quot;https://api.usergrid.com/my_org/my_app/products&quot;</span><span class="p">,</span>
+    <span class="s">&quot;entities&quot;</span> <span class="p">:</span> <span class="p">[</span> <span class="p">{</span>
+        <span class="s">&quot;uuid&quot;</span> <span class="p">:</span> <span class="s">&quot;&lt;product_uuid&gt;&quot;</span><span class="p">,</span>
+        <span class="s">&quot;type&quot;</span> <span class="p">:</span> <span class="s">&quot;product&quot;</span><span class="p">,</span>
+        <span class="s">&quot;created&quot;</span> <span class="p">:</span> <span class="mi">1395410098517</span><span class="p">,</span>
+        <span class="s">&quot;modified&quot;</span> <span class="p">:</span> <span class="mi">1395410098517</span><span class="p">,</span>
+        <span class="s">&quot;image&quot;</span> <span class="p">:</span> <span class="s">&quot;http://path.jpg&quot;</span><span class="p">,</span>
+        <span class="s">&quot;metadata&quot;</span> <span class="p">:</span> <span class="p">{</span>
+            <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span class="s">&quot;/products/&lt;product_uuid&gt;&quot;</span>
+        <span class="p">},</span>
+        <span class="s">&quot;name&quot;</span> <span class="p">:</span> <span class="s">&quot;Bouncy Castle&quot;</span><span class="p">,</span>
+        <span class="s">&quot;sku&quot;</span> <span class="p">:</span> <span class="s">&quot;35450349822&quot;</span>
+    <span class="p">},</span>
+    <span class="p">{</span>
+        <span class="s">&quot;uuid&quot;</span> <span class="p">:</span> <span class="s">&quot;&lt;product_uuid&gt;&quot;</span><span class="p">,</span>
+        <span class="s">&quot;type&quot;</span> <span class="p">:</span> <span class="s">&quot;product&quot;</span><span class="p">,</span>
+        <span class="s">&quot;created&quot;</span> <span class="p">:</span> <span class="mi">1395409669686</span><span class="p">,</span>
+        <span class="s">&quot;modified&quot;</span> <span class="p">:</span> <span class="mi">1395409669686</span><span class="p">,</span>
+        <span class="s">&quot;image&quot;</span> <span class="p">:</span> <span class="s">&quot;http://path.jpg&quot;</span><span class="p">,</span>
+        <span class="s">&quot;metadata&quot;</span> <span class="p">:</span> <span class="p">{</span>
+            <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span class="s">&quot;/products/&lt;product_uuid&gt;&quot;</span>
+        <span class="p">},</span>
+        <span class="s">&quot;description&quot;</span> <span class="p">:</span> <span class="s">&quot;It makes coffee.&quot;</span><span class="p">,</span>
+        <span class="s">&quot;name&quot;</span> <span class="p">:</span> <span class="s">&quot;Coffee Maker&quot;</span><span class="p">,</span>
+        <span class="s">&quot;sku&quot;</span> <span class="p">:</span> <span class="s">&quot;60723023589&quot;</span>
+    <span class="p">},</span>
+    <span class="p">{</span>
+        <span class="s">&quot;uuid&quot;</span> <span class="p">:</span> <span class="s">&quot;&lt;product_uuid&gt;&quot;</span><span class="p">,</span>
+        <span class="s">&quot;type&quot;</span> <span class="p">:</span> <span class="s">&quot;product&quot;</span><span class="p">,</span>
+        <span class="s">&quot;created&quot;</span> <span class="p">:</span> <span class="mi">1395407700578</span><span class="p">,</span>
+        <span class="s">&quot;modified&quot;</span> <span class="p">:</span> <span class="mi">1395407700578</span><span class="p">,</span>
+        <span class="s">&quot;metadata&quot;</span> <span class="p">:</span> <span class="p">{</span>
+            <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span class="s">&quot;/products/&lt;product_uuid&gt;&quot;</span>
+        <span class="p">},</span>
+        <span class="s">&quot;name&quot;</span> <span class="p">:</span> <span class="s">&quot;Air Mattress&quot;</span><span class="p">,</span>
+        <span class="s">&quot;sku&quot;</span> <span class="p">:</span> <span class="s">&quot;53045985365&quot;</span>
+    <span class="p">}],</span>
+    <span class="s">&quot;timestamp&quot;</span> <span class="p">:</span> <span class="mi">1396290037640</span><span class="p">,</span>
+    <span class="s">&quot;duration&quot;</span> <span class="p">:</span> <span class="mi">91</span><span class="p">,</span>
+    <span class="s">&quot;organization&quot;</span> <span class="p">:</span> <span class="s">&quot;my_org&quot;</span><span class="p">,</span>
+    <span class="s">&quot;applicationName&quot;</span> <span class="p">:</span> <span class="s">&quot;my_app&quot;</span><span class="p">,</span>
+    <span class="s">&quot;count&quot;</span> <span class="p">:</span> <span class="mi">3</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+      
+        <a href="optimizing-access.html" class="btn btn-neutral float-right" title="Data Store Best Practices" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+      
+      
+        <a href="../getting-started/using-the-api.html" class="btn btn-neutral" title="Using the API" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+      
+    </div>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

[10/60] [abbrv] incubator-usergrid git commit: cherry picking docs from master

[sn...@apache.org]

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/sdks/ios.html
----------------------------------------------------------------------
diff --git a/content/docs/sdks/ios.html b/content/docs/sdks/ios.html
new file mode 100644
index 0000000..e77c1c5
--- /dev/null
+++ b/content/docs/sdks/ios.html
@@ -0,0 +1,280 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>iOS SDK &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>iOS SDK</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/sdks/ios.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="ios-sdk">
+<h1>iOS SDK<a class="headerlink" href="#ios-sdk" title="Permalink to this headline">¶</a></h1>
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/sdks/java.html
----------------------------------------------------------------------
diff --git a/content/docs/sdks/java.html b/content/docs/sdks/java.html
new file mode 100644
index 0000000..e94bcc0
--- /dev/null
+++ b/content/docs/sdks/java.html
@@ -0,0 +1,280 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>Java SDK &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>Java SDK</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/sdks/java.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="java-sdk">
+<h1>Java SDK<a class="headerlink" href="#java-sdk" title="Permalink to this headline">¶</a></h1>
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/sdks/javascript.html
----------------------------------------------------------------------
diff --git a/content/docs/sdks/javascript.html b/content/docs/sdks/javascript.html
new file mode 100644
index 0000000..bf4e87e
--- /dev/null
+++ b/content/docs/sdks/javascript.html
@@ -0,0 +1,280 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>JavaScript/HTML5 SDK &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>JavaScript/HTML5 SDK</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/sdks/javascript.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="javascript-html5-sdk">
+<h1>JavaScript/HTML5 SDK<a class="headerlink" href="#javascript-html5-sdk" title="Permalink to this headline">¶</a></h1>
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/sdks/tbd.html
----------------------------------------------------------------------
diff --git a/content/docs/sdks/tbd.html b/content/docs/sdks/tbd.html
new file mode 100644
index 0000000..a266bfa
--- /dev/null
+++ b/content/docs/sdks/tbd.html
@@ -0,0 +1,291 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>COMING SOON... &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+        <link rel="next" title="Usegrid 1: Deploying to Tomcat" href="../installation/ug1-deploy-to-tomcat.html"/>
+        <link rel="prev" title="Methods" href="../rest-endpoints/api-docs.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul class="current">
+<li class="toctree-l1 current"><a class="current reference internal" href="">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>COMING SOON...</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/sdks/tbd.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="coming-soon">
+<h1>COMING SOON...<a class="headerlink" href="#coming-soon" title="Permalink to this headline">¶</a></h1>
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+      
+        <a href="../installation/ug1-deploy-to-tomcat.html" class="btn btn-neutral float-right" title="Usegrid 1: Deploying to Tomcat" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+      
+      
+        <a href="../rest-endpoints/api-docs.html" class="btn btn-neutral" title="Methods" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+      
+    </div>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/sdks/usage.html
----------------------------------------------------------------------
diff --git a/content/docs/sdks/usage.html b/content/docs/sdks/usage.html
new file mode 100644
index 0000000..9c95dcc
--- /dev/null
+++ b/content/docs/sdks/usage.html
@@ -0,0 +1,308 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>SDKs &amp; Tools &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>SDKs &amp; Tools</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/sdks/usage.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="sdks-tools">
+<h1>SDKs &amp; Tools<a class="headerlink" href="#sdks-tools" title="Permalink to this headline">¶</a></h1>
+<div class="section" id="sdks">
+<h2>SDKs<a class="headerlink" href="#sdks" title="Permalink to this headline">¶</a></h2>
+<ul class="simple">
+<li><a class="reference external" href="https://github.com/apache/incubator-usergrid/tree/master/sdks/ios">iOS
+SDK</a></li>
+<li><a class="reference external" href="https://github.com/apache/incubator-usergrid/tree/master/sdks/android">Android
+SDK</a></li>
+<li><a class="reference external" href="https://github.com/apache/incubator-usergrid/tree/master/sdks/html5-javascript">HTML5 / JavaScript
+SDK</a></li>
+<li><a class="reference external" href="https://github.com/apache/incubator-usergrid/tree/master/sdks/dotnet">Windows 8 / Windows Phone / .net
+SDK</a></li>
+<li><a class="reference external" href="https://github.com/apache/incubator-usergrid/tree/master/sdks/ruby">Ruby
+gem</a></li>
+<li><a class="reference external" href="https://github.com/apache/incubator-usergrid/tree/master/sdks/ruby-on-rails">Ruby on Rails
+gem</a></li>
+<li><a class="reference external" href="https://github.com/apache/incubator-usergrid/tree/master/sdks/php">PHP
+library</a></li>
+<li><a class="reference external" href="https://github.com/apache/incubator-usergrid/tree/master/sdks/java">Java
+library</a></li>
+<li><a class="reference external" href="https://github.com/apache/incubator-usergrid/tree/master/sdks/perl">Perl
+module</a></li>
+</ul>
+</div>
+<div class="section" id="tools">
+<h2>Tools<a class="headerlink" href="#tools" title="Permalink to this headline">¶</a></h2>
+<p><a class="reference external" href="https://github.com/apache/incubator-usergrid/tree/master/ugc#usergrid-command-line-ugc">ugc — the Command-line
+Client</a></p>
+</div>
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/search.html
----------------------------------------------------------------------
diff --git a/content/docs/search.html b/content/docs/search.html
new file mode 100644
index 0000000..bddb739
--- /dev/null
+++ b/content/docs/search.html
@@ -0,0 +1,293 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>Search &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="index.html"/> 
+
+  
+  <script src="_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="#" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="data-queries/query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="data-queries/operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="security-and-auth/app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="security-and-auth/authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="user-management/user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="asset-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="asset-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="index.html">Docs</a> &raquo;</li>
+      
+    <li></li>
+      <li class="wy-breadcrumbs-aside">
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <noscript>
+  <div id="fallback" class="admonition warning">
+    <p class="last">
+      Please activate JavaScript to enable the search
+      functionality.
+    </p>
+  </div>
+  </noscript>
+
+  
+  <div id="search-results">
+  
+  </div>
+
+           </div>
+          </div>
+          <footer>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'./',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="_static/jquery.js"></script>
+      <script type="text/javascript" src="_static/underscore.js"></script>
+      <script type="text/javascript" src="_static/doctools.js"></script>
+      <script type="text/javascript" src="_static/searchtools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+  
+  <script type="text/javascript">
+    jQuery(function() { Search.loadIndex("searchindex.js"); });
+  </script>
+  
+  <script type="text/javascript" id="searchindexloader"></script>
+   
+
+
+</body>
+</html>
\ No newline at end of file

[56/60] [abbrv] incubator-usergrid git commit: Fixing link to docs.

[sn...@apache.org]

Fixing link to docs.

(cherry picked from commit 2cf496632d235b74cb4191f9e738b338abbe699c)


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/38afc44d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/38afc44d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/38afc44d

Branch: refs/heads/two-dot-o-dev
Commit: 38afc44d786f2dddda0eef97d2c96a90ccd1ff56
Parents: 64687d1
Author: Dave Johnson <sn...@apache.org>
Authored: Fri Aug 7 17:13:49 2015 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Wed Aug 12 13:02:49 2015 -0400

----------------------------------------------------------------------
 content/community/index.html |  2 +-
 content/index.html           |  2 +-
 content/releases/index.html  |  2 +-
 website/layouts/header.html  |  2 +-
 website/tmp/checksums        |  4 ++--
 website/tmp/compiled_content | 12 ++++++------
 6 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/38afc44d/content/community/index.html
----------------------------------------------------------------------
diff --git a/content/community/index.html b/content/community/index.html
index c78171e..97f8b1d 100644
--- a/content/community/index.html
+++ b/content/community/index.html
@@ -215,7 +215,7 @@
         <nav class="collapse navbar-collapse bf-navbar-collapse" role="navigation">
             <ul class="nav navbar-nav navbar-right">
                 <li class="active"><a href="/community/"><span class="icns icon-group"></span></a></li>
-                <li><a href="docs" target="_blank"><span class="icns icon-book"></span></a></li>
+                <li><a href="/docs" target="_blank"><span class="icns icon-book"></span></a></li>
                 <li><a href="http://github.com/apache/incubator-usergrid" target="_blank"><span class="icns icon-github-sign"></span></a></li>
                 <!--<li><a href="https://trello.com/b/exQmJIOn/usergrid" target="_blank"><span class="icns icon-trello"></span></a></li>-->
                 <li><a href="https://issues.apache.org/jira/secure/RapidBoard.jspa?rapidView=23&view=planning&selectedIssue=USERGRID-362&epics=visible" 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/38afc44d/content/index.html
----------------------------------------------------------------------
diff --git a/content/index.html b/content/index.html
index 23096ce..7b6cc33 100644
--- a/content/index.html
+++ b/content/index.html
@@ -46,7 +46,7 @@
         <nav class="collapse navbar-collapse bf-navbar-collapse" role="navigation">
             <ul class="nav navbar-nav navbar-right">
                 <li class=""><a href="/community/"><span class="icns icon-group"></span></a></li>
-                <li><a href="docs" target="_blank"><span class="icns icon-book"></span></a></li>
+                <li><a href="/docs" target="_blank"><span class="icns icon-book"></span></a></li>
                 <li><a href="http://github.com/apache/incubator-usergrid" target="_blank"><span class="icns icon-github-sign"></span></a></li>
                 <!--<li><a href="https://trello.com/b/exQmJIOn/usergrid" target="_blank"><span class="icns icon-trello"></span></a></li>-->
                 <li><a href="https://issues.apache.org/jira/secure/RapidBoard.jspa?rapidView=23&view=planning&selectedIssue=USERGRID-362&epics=visible" 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/38afc44d/content/releases/index.html
----------------------------------------------------------------------
diff --git a/content/releases/index.html b/content/releases/index.html
index a8579ef..82925f5 100644
--- a/content/releases/index.html
+++ b/content/releases/index.html
@@ -46,7 +46,7 @@
         <nav class="collapse navbar-collapse bf-navbar-collapse" role="navigation">
             <ul class="nav navbar-nav navbar-right">
                 <li class=""><a href="/community/"><span class="icns icon-group"></span></a></li>
-                <li><a href="docs" target="_blank"><span class="icns icon-book"></span></a></li>
+                <li><a href="/docs" target="_blank"><span class="icns icon-book"></span></a></li>
                 <li><a href="http://github.com/apache/incubator-usergrid" target="_blank"><span class="icns icon-github-sign"></span></a></li>
                 <!--<li><a href="https://trello.com/b/exQmJIOn/usergrid" target="_blank"><span class="icns icon-trello"></span></a></li>-->
                 <li><a href="https://issues.apache.org/jira/secure/RapidBoard.jspa?rapidView=23&view=planning&selectedIssue=USERGRID-362&epics=visible" 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/38afc44d/website/layouts/header.html
----------------------------------------------------------------------
diff --git a/website/layouts/header.html b/website/layouts/header.html
index 0415ce2..fa1b189 100644
--- a/website/layouts/header.html
+++ b/website/layouts/header.html
@@ -212,7 +212,7 @@
         <nav class="collapse navbar-collapse bf-navbar-collapse" role="navigation">
             <ul class="nav navbar-nav navbar-right">
                 <li class="<%= 'active' if @community %>"><a href="/community/"><span class="icns icon-group"></span></a></li>
-                <li><a href="docs" target="_blank"><span class="icns icon-book"></span></a></li>
+                <li><a href="/docs" target="_blank"><span class="icns icon-book"></span></a></li>
                 <li><a href="http://github.com/apache/incubator-usergrid" target="_blank"><span class="icns icon-github-sign"></span></a></li>
                 <!--<li><a href="https://trello.com/b/exQmJIOn/usergrid" target="_blank"><span class="icns icon-trello"></span></a></li>-->
                 <li><a href="https://issues.apache.org/jira/secure/RapidBoard.jspa?rapidView=23&view=planning&selectedIssue=USERGRID-362&epics=visible" 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/38afc44d/website/tmp/checksums
----------------------------------------------------------------------
diff --git a/website/tmp/checksums b/website/tmp/checksums
index aff25aa..8b98080 100644
--- a/website/tmp/checksums
+++ b/website/tmp/checksums
@@ -1,2 +1,2 @@
-{:	data{
�[:	itemI"/bootstrap/bootstrap/:ETI"!UX93XPnLFDyD8XF010lxEWX2r1I=;F[;I"/community/;TI"!49/EqtSDrTvIN1yigaUZoHpR1CA=;F[;I"/css/bootflat-extensions/;TI"!opR0cjims7hkSGL9ll89EfkP8Y8=;F[;I"/css/bootflat-square/;TI"!ahmmWwKbEZfBoqdYMr+CzO1Ddpg=;F[;I"/css/bootflat/;TI"!4CXkIiZTvfYGEwDlXwaKXNNCKos=;F[;I"/css/font-awesome/;TI"!o03XRqSsFHFYz/Jnog9TCk/ALVM=;F[;I"/css/usergrid-site/;TI"!4lHcffPcQpH6sPesUc6Lsdiwsng=;F[;I"/docs/access-token/;TI"!sJ5bFNSo5YkKLDml2z68geJ8dAs=;F[;I"/docs/activity/;TI"!KiGgHHaVhxlsDBHK4wSHU4Kal44=;F[;I"/docs/admin-portal/;TI"!XMUamB9Zbv4UNaBwlUvb6lQpa+U=;F[;I"/docs/admin-user/;TI"!+hqD4loedhmClr+7mduSasvmvho=;F[;I"/docs/app-security/;TI"!qDvCJDxgowf84A/EhuDwO+djtvE=;F[;I"/docs/application/;TI"!vkBomFaAB128x+WbwlvliEfoclE=;F[;I"/docs/applications/;TI"!RBWNfDDIOrpnG4OJYwawdsT4gLY=;F[;I"/docs/assets/;TI"!Rs2i48JEuZfagYUx50eYPZvr3QQ=;F[;I"8/docs/authen
 ticating-users-and-application-clients/;TI"!Wlb0rR0rzBdc1Wol3U+rmAKCFBY=;F[;I"4/docs/authentication-and-access-app-services-0/;TI"!E0jP0LC3vAlLC6Gk5rVeau15vDU=;F[;I" /docs/client-authorization/;TI"!E+099lPotfl3VTpr9Mo2p7GPjKE=;F[;I"/docs/collections/;TI"!7XvRP9SGsCEWTJC5FFg88irvDNg=;F[;I" /docs/creating-collections/;TI"!GgK4/uH7LgLxA5SXngBHt5yG/sg=;F[;I")/docs/creating-custom-data-entities/;TI"!cNJmM0RyZm9W2j/PHxe9HOi+XzA=;F[;I"2/docs/creating-new-application-admin-console/;TI"!RwLQY/flqMOY6cfnYjxnYWdycGw=;F[;I"/docs/data-model/;TI"!d3hy3KjyRuCoZiAUbSOV6ZjxvfI=;F[;I"/docs/data-query-overview/;TI"!lMFiYi0KjHuxAMoo5pPb9iZOmxo=;F[;I"!/docs/default-data-entities/;TI"!N8SRsqPk3NUsKz+xMpG/hCiaXpY=;F[;I" /docs/deleting-collections/;TI"!6k7X+Y5UMjagZXgJ83Y7C+qCEiQ=;F[;I""/docs/deleting-data-entities/;TI"!XhKPWMNLoz9yR/GTb8wEDLmhAng=;F[;I"/docs/device/;TI"!0fhnCWW0jAfyQuymmbHanhVdXIU=;F[;I";/docs/displaying-app
 -services-api-calls-curl-commands/;TI"!hD4+YkGiJ7D1nDvN1Rc3D2tdppY=;F[;I"!/docs/events-and-counters 2/;TI"!0X4WXNhMX1yEgSayQVcaL9vJYfQ=;F[;I"/docs/events-and-counters/;TI"!zYZiuwam5Kgw0v5l/e5eLLGSPTc=;F[;I"/docs/facebook-sign/;TI"!cWucJI/rNBbFZ22w4Y1jgLmryco=;F[;I"/docs/features/;TI"!dt3/nmR9h32O/48gZBIpv4TA+6g=;F[;I"/docs/folder/;TI"!NCc8GlSq7oWSqBFFA2XYjKwNqE4=;F[;I"/docs/geolocation/;TI"!o0jvHi8IDiQMecZW52hXBHOWOLc=;F[;I"*/docs/getting-up-and-running-locally/;TI"!e6jt4UPmK5OzYNLuDQ44XlHagHI=;F[;I"/docs/group 2/;TI"!dbfHreBluYQZEi/qHaXLXNGFquA=;F[;I"/docs/group/;TI"!7qfz7VpryLhSO5r+JfufWn8nxHo=;F[;I"/docs/groups/;TI"!lTAadPa1T79P/H7UE27MuShBH9A=;F[;I"#/docs/html-5-example-messagee/;TI"!asQgmDRF10/zn4ZAbTPwr42Cuf4=;F[;I"/docs/;TI"!0Gc0eBNvMPBoqsifWOJkx9RJ3Jg=;F[;I"5/docs/managing-access-defining-permission-rules/;TI"!EVOxJAt7wHJFQnTVTDMaVzzdn30=;F[;I"/docs/messagee-example/;TI"!H9snglQUO
 iqEnt4DAdpfaq1kWOM=;F[;I"/docs/nodejs-module/;TI"!tjCOmaE8Iqy+1xnnApnzwSMVQOI=;F[;I"/docs/organization/;TI"!Ro2MEXd9f/Ey005gwBqWommH12g=;F[;I""/docs/organizations-admins 2/;TI"!SyzmVE6JhswIYyfkZ8LM3k7GGGQ=;F[;I" /docs/organizations-admins/;TI"!LGMnDOIJyNiaA05u/YFYA4pFTFE=;F[;I"/docs/overview/;TI"!IM616gkwwWCLYA1cyuYcYV1SlJA=;F[;I"/docs/query-language/;TI"!FXh38MitlyTgvfavxf9oeVDYB04=;F[;I"&/docs/querying-data-admin-portal/;TI"!d1SmVP4424Upyd53X7VsKWg6WWs=;F[;I"+/docs/querying-your-app-services-data/;TI"!OjvFQQI/P+utnPIOWPTnKYsvbjM=;F[;I"/docs/relationships/;TI"!i6s/7OInIhyELY+jhpcJn6ze1XQ=;F[;I"/docs/rest-api/;TI"!zkSo5PrH4bNT9Fkg9IotmpUlF3w=;F[;I"/docs/rest-endpoints/;TI"!XsjMPez5lIGzwp21XS4fE27kRvc=;F[;I""/docs/retrieving-collections/;TI"!Rwoo5Ac7/GlSNzXOwNM1ODnhYqM=;F[;I"$/docs/retrieving-data-entities/;TI"!NCxcYpGq+lM5+G96/Alj8r0F5r4=;F[;I"/docs/role/;TI"!30Miopbr8+vTF3ofRrAc65ejkVY=;F[
 ;I"!/docs/roles-and-permissions/;TI"!x6yz2EHMvCwroiAex/fbdSpyS3Y=;F[;I"/docs/ruby-gem/;TI"!FWS8NAksszPnlzGPVRWmzHc6MfA=;F[;I"/docs/securing-your-app/;TI"!O/LZpfS6mHX83Ot5o846lJpjH1c=;F[;I"/docs/security-model/;TI"!zgeJsYPhkvGJ494pYzQdhkbtZqs=;F[;I" /docs/updating-collections/;TI"!MU5pYESVEfLJ9zNxmYrcCZxjyGE=;F[;I""/docs/updating-data-entities/;TI"!Un1y0x108XS1qLe4kKe92sg7vEs=;F[;I"/docs/upgrading/;TI"!/Gagi05VTncMU2dVig8Tm6DhX1U=;F[;I"&/docs/uploading-files-and-assets/;TI"!pslYeOoUmk6B9Y09vtzuXQ995zs=;F[;I"/docs/user/;TI"!GIff/8+sc4WsHVfbFjqiJl4PnPs=;F[;I"/docs/users-devices/;TI"!8FsDxWVeQhd/8WW/DCtrURhC8yo=;F[;I"/docs/using-api/;TI"!DWLCS7/PYLtZ2iDbnk5tJ05pkVg=;F[;I"%/docs/using-sandbox-application/;TI"!RWzmW0icE4mkU6h41PvCf85o1O8=;F[;I"/favicon/;TI"!OLxQ8ErXT/0xQVS4s2B3ot607HU=;F[;I"#/font/fontawesome-webfont-eot/;TI"!6/YrsytfwnHZEAmVanhjYfqLT1w=;F[;I"#/font/fontawesome-webfont-svg/;TI"
 !ln3rJPg6ZKzAfTE1CpHGZGn0sm4=;F[;I"#/font/fontawesome-webfont-ttf/;TI"!JArPjvJ4tDzA/tPBNuQZQBPA2LU=;F[;I"$/font/fontawesome-webfont-woff/;TI"!KGowG+qs0SvXXJoZwFgktVpYFE4=;F[;I"/font/FontAwesome/;TI"!XNHLOH7drwf3xamKwm6pi+iyVcM=;F[;I"/img/alberto/;TI"!G/puDUV77NdctY0bblHwLR3SUWs=;F[;I"/img/alex/;TI"!/EW8fGOK8kayjvwYnJ9CWrNaPMg=;F[;I""/img/apache_usergrid_favicon/;TI"!k64gX3pMFYzMpUgTWX0/iFPbzpY=;F[;I"%/img/apache_usergrid_logo_white/;TI"!c8yHE9nnG5js9/2WO+5oJTtLSs4=;F[;I"+/img/apache_usergrid_logo_white_small/;TI"!qRxSGezvFKeU904JzW+JECqd4Dw=;F[;I"/img/check_flat/default/;TI"!wweg+TSTnsrlXcgpMTCXnfTv3Ts=;F[;I"/img/dave/;TI"!CJo3NeC3tEi9wchL6FTf/s3O5Zg=;F[;I"
/img/ed/;TI"!kSN2p8G9amAK2h3k3IBUYM8RzFc=;F[;I"/img/egg-logo/;TI"!iid1SPvl3IOcJfe54K3KYYPdWMo=;F[;I"/img/grey/;TI"!0j/yK6ksEGAslBXZHJ07PvP5kQQ=;F[;I"/img/nate/;TI"!3xx7EBTskWymUUjRlj3iwPr84fU=;F[;I"/img/rod/;TI"!Vb9yzMw7grRQ1ZvTfTgV
 iJ8Bspo=;F[;I"/img/scott/;TI"!eKpF/fRf6IifEMaG3eNNqtFnugM=;F[;I"/img/strong/;TI"!SXcS9FYWt33nC6TkuVudT8vaVWU=;F[;I"/img/sungju/;TI"!LpyCusX73mAojpxYLNP4zE/BFCQ=;F[;I"/img/tim/;TI"!F4TUjvcVto24a78H8qnEpPSVeTw=;F[;I"/img/todd/;TI"!Tsl/sCFaZMXOgdY6W6KtGKeUfjU=;F[;I"/img/usergrid-logo/;TI"!FMn+BPORWmvVZKqYkAKOJdBfy+0=;F[;I"/img/usergrid/;TI"!oy6NPpvauKKIXSPuJTBik8O7Ef4=;F[;I"/img/usergrid_160/;TI"!yqVs1z46EctOfGrka1U6sli2kkg=;F[;I"/img/usergrid_200/;TI"!And0CrWJb98+d7e5gV+dm5Af4A8=;F[;I"/img/usergrid_300/;TI"!swjlrK9ovJ5K1Zwo78r7nuptt7g=;F[;I"#/img/usergrid_300_transparent/;TI"!iJjyFH9NHLU/DpTCe2Xx9KSU96c=;F[;I"/img/usergrid_400/;TI"!YBb5d3gsPuO+3EuUOqm/hGC7yho=;F[;I"/img/usergrid_800/;TI"!rzaEuT3xIZRoJcu00v4hEr8QZk4=;F[;I"/img/usergrid_card/;TI"!95yKbxbPp7wzxx7tpMGttJb03UY=;F[;I"/img/usergrid_logo/;TI"!sFaRm4isJK+htlyyKqzzd7Pn3l0=;F[;I"/img/usergrid_logo_205_50/;TI"!fZyZT8DDvj
 7PNO+kT8VUpxCUxY4=;F[;I"/img/usergrid_logo_260_50/;TI"!mvyKLJzofFU/wtfnCIkb0RoigvQ=;F[;I"/img/usergrid_logo_720/;TI"!Sgx8JBVlhBqsoLnMwk+V+CnhuEQ=;F[;I"/img/usergrid_logo_720p/;TI"!5Sp380wN4WtMrpS5hbnsYnGtmZg=;F[;I" /img/usergrid_logo_900_200/;TI"!pc+JmD7+pDLmTg+6UNVOWdSIq+Y=;F[;I"/img/usergrid_logo_white/;TI"!jogEbf8m34FR01OZZ+mnixjwqhs=;F[;I"/img/usergrid_profile_128/;TI"!mFLx/BwBTQqSY1FJJDeEHlSlSiY=;F[;I"/img/usergrid_profile_256/;TI"!Ke2CDPgjbwP0rg8jUzxIsOdlLXk=;F[;I"%/img/usergrid_profile_256_white/;TI"!to9N1HI6hG3bBcqFLv4W9d4teUs=;F[;I"'/img/usergrid_profile_512_margins/;TI"!npGFb2y+bxErvommrupVW+ZuJ5w=;F[;I"$/img/usergrid_profile_64_white/;TI"!fzlXlPBrpH1/k6sR4hB7Y8Y0pK4=;F[;I"&/img/usergrid_profile_background/;TI"!k8wWDAB25YLtwWScW3TgQEpGuSs=;F[;I"!/img/usergrid_screencast_bg/;TI"!31q7874rwUqa6lv1Jlh1kNOrod8=;F[;I"/img/usergrid_small_100/;TI"!AiRJnZKOeIfSGqtgRYMN1kESnco=;F[;I"/img/usergr
 id_wiki/;TI"!OjS8Wweix1KQ+qoVajeIJSztUlA=;F[;I"/;TI"!Q5DIF5nRoiogS4BkhrEgBYmR84g=;F[;I"/js/bootstrap/;TI"!BtKopvK+9u/oZXADRJo89sdwc8E=;F[;I"/js/head/;TI"!+Hf4ESgYFiFLXCbd0Xb2rV6TKbQ=;F[;I"/js/html5shiv/;TI"!iETKkQSx2doTL4EKRHISScT2NuI=;F[;I"/js/jquery-1/;TI"!bXtX2g6/HqMIdBN0dLpAQYpA2ws=;F[;I"/js/jquery/;TI"!41h5fqXtaJrInWYaB5+QNd01WGs=;F[;I"/js/respond/;TI"!q1buQ19NZtFqjJorJfRvgXKIPks=;F[;I"/js/usergrid-site/;TI"!/nr1TmnOScV/a4AqnYvGj71SIx4=;F[;I"/static/github-btn/;TI"!vnSME9sRCDXUOGFxaizFz61GWRw=;F[:layoutI"/community/;TI"!Vz6WtgEl8BB6t96FGbzN5hhVc4c=;F[;I"/default/;TI"!k9I6lOQ4z4+nHoc8WQw7P2MoKbY=;F[;I"/docs/;TI"!tmBld5ZHivR/56iHwp6I0LUoPlc=;F[;I"
/footer/;TI"!A2Bvp2oFTYnDJ/cc9h+T+Qf/8Y4=;F[;I"
/header/;TI"!YvLsUtwP7SNsyjfKnc0z31F0Kio=;F[:code_snippetI"lib/default.rb;TI"!obtwYGHKsZcksb03nMTPrlOqd5U=;F[;	I"lib/helpers_.rb;TI"!huKhcwQYeoQiIuYmRpgzAwKwrbc=;F:configI"!Sxv
 usj+Tnw1yNJuSGRkZ7fv3R2Q=;F:
-rulesI"!nclWn6tIAjzNd8AV/It9HpNy9y0=;F[;I"/docs/contribute-code/;TI"!4qf8xPP00M97O2Mn7aYskiaZHbY=;F[;I"/docs/contributecode/;TI"Vf83fd7240a06d583d5e2b6f5b79d2d41b4f40e43,1d274687d36e5d4c2895acd54366d5b20424dd7b;F[;I"/docs/deploy-local/;TI"!I27C7JJfNAkb4Ex6xYv/m1OA/iA=;F[;I"/img/shawn/;TI"!BiPuzprXnYTUvsGYH9LNpTWQdDU=;F[;I"/docs/old-forks/;TI"!3TvEGi1GeqC18Y/Dd6Uxm2vcKXM=;F[;I"/docs/presentations/;TI"!6RN7MD+JH6zEZ7rrLv/L1s6i2s4=;F[;I"/docs/videos/;TI"!U/emu6XGZOBxvjxIiDIWcXWGkAw=;F[;I"/img/github/;TI"!Ix0MCoVNAXiXe357dU8T31+hjd0=;F[;I"/img/stliu/;TI"!0boMj0nkO0ERmKQJjAcxDziHTBc=;F[;I"/releases/;TI"!PO3ADljBwIQXBoR5tou0wBjWovI=;F[;I"/img/intellij/;TI"!qSQ2o1ZY5UHLjQd7SrKq6Wr4bQE=;F[;I"/img/structure101/;TI"!/J4FqIbPo/DuQCPEQmYx7YN15eA=;F[;I"/img/yourkit/;TI"!w/mtzt7B3RMaVLNaKraUMs2kw6s=;F[;I"/img/jeff/;TI"!jtJr59eWB647X2vPsz6A/S1SeJA=;F:versioni
\ No newline at end of file
+{:	data{
�[:	itemI"/bootstrap/bootstrap/:ETI"!BE+tNcz6Zg8cRMWhaJmN6la4un0=;F[;I"/community/;TI"!ASG8rvE9GWQssx+35fxCx+7cwRo=;F[;I"/css/bootflat-extensions/;TI"!PSQFihOUJ0wESX59td1x+pY+qwQ=;F[;I"/css/bootflat-square/;TI"!3El/bCjbRO2H1LeGDot/CQkUh4o=;F[;I"/css/bootflat/;TI"!SNXjafQ9KpFGj5c14y6cc0ZowVw=;F[;I"/css/font-awesome/;TI"!VUAyztBHgoBvxDTFbIpQIkGFSss=;F[;I"/css/usergrid-site/;TI"!spXooBCkoYeICSEGSzs+ZMfA5U4=;F[;I"/docs/access-token/;TI"!sJ5bFNSo5YkKLDml2z68geJ8dAs=;F[;I"/docs/activity/;TI"!KiGgHHaVhxlsDBHK4wSHU4Kal44=;F[;I"/docs/admin-portal/;TI"!XMUamB9Zbv4UNaBwlUvb6lQpa+U=;F[;I"/docs/admin-user/;TI"!+hqD4loedhmClr+7mduSasvmvho=;F[;I"/docs/app-security/;TI"!qDvCJDxgowf84A/EhuDwO+djtvE=;F[;I"/docs/application/;TI"!vkBomFaAB128x+WbwlvliEfoclE=;F[;I"/docs/applications/;TI"!RBWNfDDIOrpnG4OJYwawdsT4gLY=;F[;I"/docs/assets/;TI"!Rs2i48JEuZfagYUx50eYPZvr3QQ=;F[;I"8/docs/authen
 ticating-users-and-application-clients/;TI"!Wlb0rR0rzBdc1Wol3U+rmAKCFBY=;F[;I"4/docs/authentication-and-access-app-services-0/;TI"!E0jP0LC3vAlLC6Gk5rVeau15vDU=;F[;I" /docs/client-authorization/;TI"!E+099lPotfl3VTpr9Mo2p7GPjKE=;F[;I"/docs/collections/;TI"!7XvRP9SGsCEWTJC5FFg88irvDNg=;F[;I" /docs/creating-collections/;TI"!GgK4/uH7LgLxA5SXngBHt5yG/sg=;F[;I")/docs/creating-custom-data-entities/;TI"!cNJmM0RyZm9W2j/PHxe9HOi+XzA=;F[;I"2/docs/creating-new-application-admin-console/;TI"!RwLQY/flqMOY6cfnYjxnYWdycGw=;F[;I"/docs/data-model/;TI"!d3hy3KjyRuCoZiAUbSOV6ZjxvfI=;F[;I"/docs/data-query-overview/;TI"!lMFiYi0KjHuxAMoo5pPb9iZOmxo=;F[;I"!/docs/default-data-entities/;TI"!N8SRsqPk3NUsKz+xMpG/hCiaXpY=;F[;I" /docs/deleting-collections/;TI"!6k7X+Y5UMjagZXgJ83Y7C+qCEiQ=;F[;I""/docs/deleting-data-entities/;TI"!XhKPWMNLoz9yR/GTb8wEDLmhAng=;F[;I"/docs/device/;TI"!0fhnCWW0jAfyQuymmbHanhVdXIU=;F[;I";/docs/displaying-app
 -services-api-calls-curl-commands/;TI"!hD4+YkGiJ7D1nDvN1Rc3D2tdppY=;F[;I"!/docs/events-and-counters 2/;TI"!0X4WXNhMX1yEgSayQVcaL9vJYfQ=;F[;I"/docs/events-and-counters/;TI"!zYZiuwam5Kgw0v5l/e5eLLGSPTc=;F[;I"/docs/facebook-sign/;TI"!cWucJI/rNBbFZ22w4Y1jgLmryco=;F[;I"/docs/features/;TI"!dt3/nmR9h32O/48gZBIpv4TA+6g=;F[;I"/docs/folder/;TI"!NCc8GlSq7oWSqBFFA2XYjKwNqE4=;F[;I"/docs/geolocation/;TI"!o0jvHi8IDiQMecZW52hXBHOWOLc=;F[;I"*/docs/getting-up-and-running-locally/;TI"!e6jt4UPmK5OzYNLuDQ44XlHagHI=;F[;I"/docs/group 2/;TI"!dbfHreBluYQZEi/qHaXLXNGFquA=;F[;I"/docs/group/;TI"!7qfz7VpryLhSO5r+JfufWn8nxHo=;F[;I"/docs/groups/;TI"!lTAadPa1T79P/H7UE27MuShBH9A=;F[;I"#/docs/html-5-example-messagee/;TI"!asQgmDRF10/zn4ZAbTPwr42Cuf4=;F[;I"/docs/;TI"!0Gc0eBNvMPBoqsifWOJkx9RJ3Jg=;F[;I"5/docs/managing-access-defining-permission-rules/;TI"!EVOxJAt7wHJFQnTVTDMaVzzdn30=;F[;I"/docs/messagee-example/;TI"!H9snglQUO
 iqEnt4DAdpfaq1kWOM=;F[;I"/docs/nodejs-module/;TI"!tjCOmaE8Iqy+1xnnApnzwSMVQOI=;F[;I"/docs/organization/;TI"!Ro2MEXd9f/Ey005gwBqWommH12g=;F[;I""/docs/organizations-admins 2/;TI"!SyzmVE6JhswIYyfkZ8LM3k7GGGQ=;F[;I" /docs/organizations-admins/;TI"!LGMnDOIJyNiaA05u/YFYA4pFTFE=;F[;I"/docs/overview/;TI"!IM616gkwwWCLYA1cyuYcYV1SlJA=;F[;I"/docs/query-language/;TI"!FXh38MitlyTgvfavxf9oeVDYB04=;F[;I"&/docs/querying-data-admin-portal/;TI"!d1SmVP4424Upyd53X7VsKWg6WWs=;F[;I"+/docs/querying-your-app-services-data/;TI"!OjvFQQI/P+utnPIOWPTnKYsvbjM=;F[;I"/docs/relationships/;TI"!i6s/7OInIhyELY+jhpcJn6ze1XQ=;F[;I"/docs/rest-api/;TI"!zkSo5PrH4bNT9Fkg9IotmpUlF3w=;F[;I"/docs/rest-endpoints/;TI"!XsjMPez5lIGzwp21XS4fE27kRvc=;F[;I""/docs/retrieving-collections/;TI"!Rwoo5Ac7/GlSNzXOwNM1ODnhYqM=;F[;I"$/docs/retrieving-data-entities/;TI"!NCxcYpGq+lM5+G96/Alj8r0F5r4=;F[;I"/docs/role/;TI"!30Miopbr8+vTF3ofRrAc65ejkVY=;F[
 ;I"!/docs/roles-and-permissions/;TI"!x6yz2EHMvCwroiAex/fbdSpyS3Y=;F[;I"/docs/ruby-gem/;TI"!FWS8NAksszPnlzGPVRWmzHc6MfA=;F[;I"/docs/securing-your-app/;TI"!O/LZpfS6mHX83Ot5o846lJpjH1c=;F[;I"/docs/security-model/;TI"!zgeJsYPhkvGJ494pYzQdhkbtZqs=;F[;I" /docs/updating-collections/;TI"!MU5pYESVEfLJ9zNxmYrcCZxjyGE=;F[;I""/docs/updating-data-entities/;TI"!Un1y0x108XS1qLe4kKe92sg7vEs=;F[;I"/docs/upgrading/;TI"!/Gagi05VTncMU2dVig8Tm6DhX1U=;F[;I"&/docs/uploading-files-and-assets/;TI"!pslYeOoUmk6B9Y09vtzuXQ995zs=;F[;I"/docs/user/;TI"!GIff/8+sc4WsHVfbFjqiJl4PnPs=;F[;I"/docs/users-devices/;TI"!8FsDxWVeQhd/8WW/DCtrURhC8yo=;F[;I"/docs/using-api/;TI"!DWLCS7/PYLtZ2iDbnk5tJ05pkVg=;F[;I"%/docs/using-sandbox-application/;TI"!RWzmW0icE4mkU6h41PvCf85o1O8=;F[;I"/favicon/;TI"!X4PIbApzeRU6s+oNiLbzvuF9L5g=;F[;I"#/font/fontawesome-webfont-eot/;TI"!3B+LEIodD3hze44yMpJ52B2544E=;F[;I"#/font/fontawesome-webfont-svg/;TI"
 !ltNbRWDhxN+Hvlm+kKfkuuA1YxA=;F[;I"#/font/fontawesome-webfont-ttf/;TI"!2bB5HSdyXYf4kCaiu//JONEONNw=;F[;I"$/font/fontawesome-webfont-woff/;TI"!UkzY9wJf9hoI3UqoI5llnG/OuZE=;F[;I"/font/FontAwesome/;TI"!2TDNZR90GB41fZJl/861yz7+zUw=;F[;I"/img/alberto/;TI"!f/rAMir2Cn0jWwA4N7bM3Ch0Cu4=;F[;I"/img/alex/;TI"!uMnVYXnPevqGsMI1bXkRjp8JRZc=;F[;I""/img/apache_usergrid_favicon/;TI"!6D0hrhKJOFr2laZTQPa3VG0DbmU=;F[;I"%/img/apache_usergrid_logo_white/;TI"!1rKENU0xV2EcaG2DVBHUc+rSBK8=;F[;I"+/img/apache_usergrid_logo_white_small/;TI"!LgynYDpEp5lWfyTcaNJApCfYdGQ=;F[;I"/img/check_flat/default/;TI"!YYYFmYUyyd018gSU3zFJsUlbVZY=;F[;I"/img/dave/;TI"!3enRKJioQIQTUb6FYSNg/lXhH7s=;F[;I"
/img/ed/;TI"!7zXZ+Fa1ut63qqO28kP8bkFqEjk=;F[;I"/img/egg-logo/;TI"!OYjxz813OEBBXBj3P3HKjjSJxPQ=;F[;I"/img/grey/;TI"!NHsS+0H5vr6CTDnafyOl7JZl9Cc=;F[;I"/img/nate/;TI"!qy1QmbrXgSpv/T4uNZr9Mqekd7A=;F[;I"/img/rod/;TI"!OaBz7qmw2qP0hSEXjHV6
 O9zdmmY=;F[;I"/img/scott/;TI"!0BsMv8bOwFIgQlIXKAn7SDVGzts=;F[;I"/img/strong/;TI"!VygZ5vSNbUrKTYpb7nOzjVvG/+Y=;F[;I"/img/sungju/;TI"!jijCp/iKF5Ky4rax0VHpRDcLsIw=;F[;I"/img/tim/;TI"!41VdsrLj75gaZsX8ZhFebsg+zGM=;F[;I"/img/todd/;TI"!86WUnZ7BA9xsS80sDC6BTG/ThuE=;F[;I"/img/usergrid-logo/;TI"!Aqk5UXUo4dFeEOZMrVAXy+Y5Vi0=;F[;I"/img/usergrid/;TI"!nIzFeYoyyCN9BhPyOlxBE2dV5jQ=;F[;I"/img/usergrid_160/;TI"!m5B/B6Zt3k1dtKXbMKW6l116khA=;F[;I"/img/usergrid_200/;TI"!sq+SHCkGtdMhHr0nlFTHgE9LW5k=;F[;I"/img/usergrid_300/;TI"!eclrFaoU86QeT+el3Wi7oifcqto=;F[;I"#/img/usergrid_300_transparent/;TI"!0yKkSMN7UjGy2Sk9J+gixkgHYoE=;F[;I"/img/usergrid_400/;TI"!9Hfc5EpdxIhW6A1NOorfd1320Xk=;F[;I"/img/usergrid_800/;TI"!yv2P6q1tMzUs8l1FiDP7MOsKKBk=;F[;I"/img/usergrid_card/;TI"!Aa//Bl1mTmLn9RxJpVLED7AhTF8=;F[;I"/img/usergrid_logo/;TI"!5lU0pyh9sE/FI9ZeytBhAfEstes=;F[;I"/img/usergrid_logo_205_50/;TI"!iKXmKYPMnt
 8M0Xb9MNn64Alj9DE=;F[;I"/img/usergrid_logo_260_50/;TI"!84dC19ZCsJUI9qcna9DZAYUjBAA=;F[;I"/img/usergrid_logo_720/;TI"!A/fYYz3vEQr78d9LagqKDu6+FfY=;F[;I"/img/usergrid_logo_720p/;TI"!qH4bcwVqFHPg0s6AtE3lBI4DFxc=;F[;I" /img/usergrid_logo_900_200/;TI"!YIO+XZ5ntZwXd1Ubkw8mt9pmBbs=;F[;I"/img/usergrid_logo_white/;TI"!PLm+YIRBBFcR53EJmCJjqRAZypY=;F[;I"/img/usergrid_profile_128/;TI"!yaIaxOsNEfRFGqrezSbQeXKHMtI=;F[;I"/img/usergrid_profile_256/;TI"!jk9olu2ghO0Xrdoty77MOADH7Es=;F[;I"%/img/usergrid_profile_256_white/;TI"!QFeYTA+ISQR8ZOHAsAKIngavBYk=;F[;I"'/img/usergrid_profile_512_margins/;TI"!C9+Z2eTYvkWN97UJoV7ZSxu9exg=;F[;I"$/img/usergrid_profile_64_white/;TI"!JVGTWCH8c0JF8aVxgr/RzLmOiks=;F[;I"&/img/usergrid_profile_background/;TI"!LGTaigehn//IH6jXpRGCDQSYGv4=;F[;I"!/img/usergrid_screencast_bg/;TI"!u17jat/cv6E1ICaf1zVcYjnP5yE=;F[;I"/img/usergrid_small_100/;TI"!1AGpfcZsXZo1penJylFd+HSKfLg=;F[;I"/img/usergr
 id_wiki/;TI"!mAJ57NQ3R6B1gnaKIkuADywGPqE=;F[;I"/;TI"!7PQ/wBXYaAb0Jjk0usxCsta6peA=;F[;I"/js/bootstrap/;TI"!sTuwMhrenkri47tM28V7pMcWhDU=;F[;I"/js/head/;TI"!Ny4umkyjw1ZRcW1tiqyixMOZiuI=;F[;I"/js/html5shiv/;TI"!+m/AFFq64W1qh8ajwJCAl9O1sZE=;F[;I"/js/jquery-1/;TI"!pgSDvT6HU2A/bSzpYJA6ucR35uo=;F[;I"/js/jquery/;TI"!vpo5KedrGEcpbabnvT/UtbRFAhA=;F[;I"/js/respond/;TI"!IUzrEhCwtGm8E4sBXCV4Q9lsvVM=;F[;I"/js/usergrid-site/;TI"!OxCfMF/3TkAjDwdGxc20eW81oZA=;F[;I"/static/github-btn/;TI"!Dk5CHwQ0PjO53S2n9e3Yl82zLw0=;F[:layoutI"/community/;TI"!Vz6WtgEl8BB6t96FGbzN5hhVc4c=;F[;I"/default/;TI"!k9I6lOQ4z4+nHoc8WQw7P2MoKbY=;F[;I"/docs/;TI"!tmBld5ZHivR/56iHwp6I0LUoPlc=;F[;I"
/footer/;TI"!A2Bvp2oFTYnDJ/cc9h+T+Qf/8Y4=;F[;I"
/header/;TI"!9b0cDfoAq1nbSF/228dc8Z19H3o=;F[:code_snippetI"lib/default.rb;TI"!obtwYGHKsZcksb03nMTPrlOqd5U=;F[;	I"lib/helpers_.rb;TI"!huKhcwQYeoQiIuYmRpgzAwKwrbc=;F:configI"!Sxv
 usj+Tnw1yNJuSGRkZ7fv3R2Q=;F:
+rulesI"!nclWn6tIAjzNd8AV/It9HpNy9y0=;F[;I"/docs/contribute-code/;TI"!4qf8xPP00M97O2Mn7aYskiaZHbY=;F[;I"/docs/contributecode/;TI"Vf83fd7240a06d583d5e2b6f5b79d2d41b4f40e43,1d274687d36e5d4c2895acd54366d5b20424dd7b;F[;I"/docs/deploy-local/;TI"!I27C7JJfNAkb4Ex6xYv/m1OA/iA=;F[;I"/img/shawn/;TI"!DQV77mUr61bkTDWeSvcCVwX972E=;F[;I"/docs/old-forks/;TI"!3TvEGi1GeqC18Y/Dd6Uxm2vcKXM=;F[;I"/docs/presentations/;TI"!6RN7MD+JH6zEZ7rrLv/L1s6i2s4=;F[;I"/docs/videos/;TI"!U/emu6XGZOBxvjxIiDIWcXWGkAw=;F[;I"/img/github/;TI"!fZcV5HIenfH3MoHMIPWR2joRhHs=;F[;I"/img/stliu/;TI"!fE1siGDkDpby+K+al/avq4vnNtE=;F[;I"/releases/;TI"!i2Kckz8q17BkgQ0VdS2hagrFB/I=;F[;I"/img/intellij/;TI"!1YaBB2ghC9uWr3/NTIklbfZj764=;F[;I"/img/structure101/;TI"!L1bjOxaT6wK/j3YgN6gUntLMnl4=;F[;I"/img/yourkit/;TI"!vYnui0vvjZPWNy6e0di6uS6DgX8=;F[;I"/img/jeff/;TI"!wZ6dU7qfUw5BOJSe4KW8w+B/Qhk=;F:versioni
\ No newline at end of file

[09/60] [abbrv] incubator-usergrid git commit: cherry picking docs from master

[sn...@apache.org]

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/searchindex.js
----------------------------------------------------------------------
diff --git a/content/docs/searchindex.js b/content/docs/searchindex.js
new file mode 100644
index 0000000..26604b3
--- /dev/null
+++ b/content/docs/searchindex.js
@@ -0,0 +1 @@
+Search.setIndex({envversion:46,filenames:["README","asset-and-files/assets","asset-and-files/file-storage-configuration","asset-and-files/folders","asset-and-files/legacy-asset-support","asset-and-files/retrieving-assets","asset-and-files/uploading-assets","counters-and-events/creating-and-incrementing-counters","counters-and-events/events-and-counters","counters-and-events/retrieving-counters","data-queries/advanced-query-usage","data-queries/operators-and-types","data-queries/query-language","data-queries/query-parameters","data-queries/querying-your-data","data-storage/collections","data-storage/data-store-dbms","data-storage/entities","data-storage/optimizing-access","entity-connections/connecting-entities","entity-connections/disconnecting-entities","entity-connections/relationships","entity-connections/retrieving-entities","geolocation/geolocation","geolocation/tbd","getting-started/creating-a-new-application","getting-started/creating-account","getting-started/using-a-sandbox
 -app","getting-started/using-the-api","index","installation/ug1-deploy-to-tomcat","installation/ug1-launcher-quick-start","installation/ug2-deploy-to-tomcat","introduction/async-vs-sync","introduction/data-model","introduction/usergrid-features","orgs-and-apps/admin-user","orgs-and-apps/application","orgs-and-apps/managing","orgs-and-apps/organization","push-notifications/tbd","push-notifications/users-devices","reference/contribute-code","reference/presos-and-videos","rest-endpoints/api-docs","sdks/ios","sdks/java","sdks/javascript","sdks/tbd","sdks/usage","security-and-auth/app-security","security-and-auth/authenticating-api-requests","security-and-auth/authenticating-users-and-application-clients","security-and-auth/changing-token-time-live-ttl","security-and-auth/facebook-sign","security-and-auth/revoking-tokens-logout","security-and-auth/securing-your-app","security-and-auth/user-authentication-types","security-and-auth/using-permissions","user-management/activity","user-manage
 ment/group","user-management/groups","user-management/messagee-example","user-management/user-connections","user-management/user-management","user-management/working-user-data"],objects:{},objnames:{},objtypes:{},terms:{"005056c00008":65,"00767101f6b4f2cf5d02ed510dbcf0b4":60,"02e81ac5a17b":[3,11,12],"02e81adcf3d0":[6,7,9,15,17,20,22,28,58,59,60],"02e81ae236e9":60,"02e81ae61238":60,"02e81ae640dc":[3,59],"02e81ae66238":60,"02e81aeb2129":60,"02e81aeb26e9":60,"02e9sjwsf3d0":17,"03ae956a":23,"0455fc92de2636fc7a176cc5d298bb78":60,"0abe":15,"0d7cf92a":17,"0d7e":39,"0d7f":39,"0f1ff3650d20":[19,60,65],"10e":[11,12],"10e10":[11,12],"11e0":[9,65],"11e1":[3,28,34,36,39,59,60,65],"11e2":[3,6,7,9,11,12,14,15,17,20,22,28,39,58,59,60],"11e3":[6,15,17,19,20,22,23,28,53,60,65],"1231380a0284":59,"12313b01d5c1":[3,28,34,59],"12313b06ae01":59,"12313b06d112":59,"12313b111c56":39,"12313b122c56":[36,39],"12313d027361":39,"12313d027471":39,"12313d14bde7":60,"12313d1520f1":59,"12313d1c4491":[3,36,39,59],"123
 13d1c44914":59,"12313d1c5591":39,"12313d288ee0":39,"12313d288ff0":39,"12313d331ae8":59,"12313f0204b":65,"12313f0204bb":[9,65],"12313f0204bb8":65,"12331b144c65":36,"12331d1c5591":[36,39],"12424d1c4491":36,"174785aa":19,"19a0":17,"1a62":15,"1a9356ba":[15,17],"1bd100b8059e":15,"1c8f60e4":65,"1f3567aa":59,"1px":43,"1st":44,"20adr":65,"20c57d4f41cf51f2db44165eb058b3b2":[12,14],"20employe":60,"20or":17,"20titl":60,"20uuid":17,"20where":[60,65],"22000a1c4e22":60,"22000a1c5a67":[60,65],"2440ca58":59,"2482a1c5":59,"249f":23,"2ac6":3,"2ac8":3,"2d00":59,"2d21":3,"2e1db7299b0a667ed80e674a0ef9d653":6,"2nd":44,"31847b9a":15,"3192ac6a":15,"327b527f":[36,39],"328b526e":36,"328fe64a":17,"335b527f":[36,39],"33dd0563":[36,39],"3400ba10":[3,39,59],"34e26bc9":59,"3500ba10":39,"37f3":59,"38dc":17,"3d1a9356ba":17,"410b213a":6,"411c466c4f2c":[12,14],"417f":[19,60,65],"4353136f":65,"438a1ca1":9,"477d":60,"48c92c73":39,"496ca1d42ce7":15,"49ff":59,"4a1edb70":17,"4d2664c8e0c3":60,"5005a0fa":60,"503f17da":28,"5
 0gb":2,"5111c463":59,"5373d7165c2d":53,"53fe3700":15,"563f5d96":59,"58606d0a":[20,22],"58e8":[60,65],"5ae1fa7a":15,"5bb76bca":[15,17],"5bcc47ca":[20,22],"5c0c1789":[3,34],"5de0bb69":39,"5f4a65c16193":17,"5wugd":52,"61c9":59,"62de5d97":28,"62fd53c78ce7":58,"65c8":39,"6640a601":3,"6715d5ef47a6":17,"67cb":60,"698b":60,"699740088e05":7,"6a42":59,"6be0003c809b":15,"6c56ffda":19,"6fbc8157":60,"6ldstnesaaaaakhdvglhmmu86_eoyxsjjqqd1ipz":[36,65],"74d2d7da":60,"78c54a82":65,"7bf47435":3,"7fb8d891":60,"802f":60,"81581bbaf055":[15,17],"8272c9b0":[12,14],"83ceb9965c26":60,"83de":60,"83e9b7ea":17,"84a5":65,"84c0":59,"84df":17,"87b9":39,"884d":65,"89ab":15,"8a2a":17,"8a4c":58,"8ae8a6ea":65,"8bde":[20,22],"8cef":[12,14],"8d05e96f700d":15,"8d5c":28,"8dd1801e534c":19,"8e0cd3866ee20746c99e9a9825f38ad8":3,"8ea8":19,"903f":[15,17],"90f823ba15655b8cc8e3b4d63377576f":60,"917d":17,"924d":[11,12],"92c3":3,"92e2":[12,14],"9501cda1":3,"95c8":[36,39],"96f6":59,"98b9":39,"9953085ea376":6,"99a7":53,"99fd":19,"9c
 1b":60,"9ce3":17,"9d3a":7,"9e75":19,"9e92":17,"9f80":23,"9ff6c621a7a4":[15,17],"9ffc":59,"____usergrid":30,"boolean":[11,12,39,41,44],"case":[10,12,18,21,30,33,41,44,59,61,63],"class":[2,32,36,52,55,65],"default":[2,11,12,13,14,15,16,17,23,28,29,30,32],"float":[11,12],"function":[7,33,35,54,57,59,60,61,62,64],"import":[27,28,33,34,35,50],"long":[1,11,12,34,41,61],"new":[7,10,12,15,17,18,21],"null":[7,54],"public":[36,65],"return":[11,12,13,14,15,18,22,23,28,31,33,36,39,41,44,52,53,54,55,58,59,60],"short":[26,59],"static":30,"super":29,"switch":21,"transient":32,"true":[11,12,14,20,22,28,30,31,32,36,39,44,54,60,65],"try":[26,27,31,36,50,54,58],"typeof":54,"var":[10,36,54],"while":[27,30,33,34,35,41,58],a065:59,a0dd:28,a0e5:6,a0f7:59,a166:[6,7,9,15,17,20,22,28,58,60],a24f:15,a407b1e7:[60,65],a51b:17,a554b7fbd57a:28,a668717b:60,a694:[20,22],a6e3:60,a71c:58,a72a:[15,17],a7e008061e10:[20,22],a7f7:[6,7,9,15,17,20,22,28,58,60],abbrevi:[12,14,18,28],abil:[21,23,26,35,63,64],abl:[18,28,30,56
 ,57,59,64,65],about:[0,11,12,18,26,27,28,29,30,35,36,38,39,44,52,56,57,59,60,61,64,65],abov:[6,7,22,30,31,32,59],ac46:[60,65],accept:[5,52,58],access:[3,15,16,17,18,22,25,26,27],access_token:[31,51,52,53,54],accessid:2,accesstokenttl:53,accomplish:55,accord:52,account:[14,17,18],achiev:63,acknowledg:12,acquaint:59,acquir:29,across:[9,18],act:[14,59,62],action:[3,6,7,8,9,12,14,15,16,17,18,19,20,22,28,29,30,35,36,37,39],activ:[6,11,12,14,20,22,23,26,28,29,30,32,34],activit:36,activityfe:29,actor:[29,36,39],actorproperti:44,actual:18,add:[2,10,12,16,17,18,25,26,27,29],addit:[9,18,26,35,36,44,51,52,57,59,60,63,65],addpermiss:29,address:[12,14,28,30,36,39,41,44,52,65],addrol:29,adjust:[12,13],admin:[25,26,27,29,30,31,32],admin_password:52,admin_usernam:52,admin_users_require_activ:[30,32],admin_users_require_confirm:[30,32],admingmail:36,administr:[30,31,34,35,37,39,41,52,56,57],adminus:[36,39,44],adminuserproperti:44,adminuserupd:29,adomain:65,adopt:[35,42],advantag:35,advertis:23,advis
 :56,ae1f:19,aec3:59,afad:59,affect:53,after:[7,11,12,28,31,33,44,52,54,56,62],again:[30,36],against:[12,20,32,37,51,52,56,58],aggreg:9,air:16,alert:[23,33,60,61],alia:65,all:[0,7,9],allow:[8,14,23,28,30,32,34,35,39,41,44,54,57,58,59,60,61,63,64,65],almost:64,along:[12,13,18],alreadi:[17,18,26,30,41,44,54,56,62],also:[2,3,7,8,9,12,13,15,17,18,25,31,32,34,35,36,37,39,41,44,52,54,55,56,58,59,60,61,62,63,65],altern:[14,15,60,61],although:[15,17,36,59,60,65],alwai:34,amazon:2,amazonaw:30,amount:[12,13,57,59],amuramoto:[6,17,53],analysi:35,analyt:26,analyz:[35,51,52,56,57],android:[28,29,33,49,52,54,55],ani:[6,7,9,11,12,14,16,17,18,21,23,32,33,34,35,36,38,44,50,51,52,53,56,57,58,59,60,62,63,64,65],anonym:[41,59,65],anoth:[12,14,18,21,27,51,59,62,63,65],answer:65,ant:58,anuff:43,anyon:[57,59],anyth:30,anytim:59,anywher:13,apachecon:43,apidocgener:0,apige:[28,43,60],apigeemobileconfig:53,apikei:54,apn:44,app1:44,app2:44,app:[3,5,6,7,8,9,12,14,15,16,17,18,19,20,21,22],app_id:[17,44,59,60,65]
 ,app_nam:[12,37,53,55],app_uuid:[16,18],appdata:29,appear:[22,44,59,62,63],append:[9,10,15,18,23,51,54],appid:[44,54],appl:[35,44],appli:[12,28,32,53,56,58,63,64,65],applic:[3,5,6,7,8,9,12,14,15,16,17,18,19,20,22,23],application_client_secret:52,application_clientid:52,application_info:39,applicationdata:44,applicationid:[36,39,44],applicationnam:[3,6,7,9,12,14,15,16,17,18,19,20,22,28,44,53,58,59,60,65],appnam:[10,52,54],appropri:[34,41,54],approv:[30,32],arbitrari:[28,63],architectur:[16,30],area:[26,27,36,50,65],aren:[16,18],arg:[2,37,39,59,60],argument:2,arm:56,around:[0,18],arrai:[11,12,14,16,17,18,22,28,44],arrang:12,arthur:[19,20,22,63,64],articl:[14,15,17,51],asc:[12,13],ascend:[12,13],ask:[12,14,32],aspect:[8,35],asset1:3,assets_id:3,assign:[7,29,34,35,41,52,56],associ:[6,11,12,15,22,23,25,28,34,35,39,41,44,50,52,53,55,57,60,62,64,65],assum:[18,51],async:29,asynchron:29,atistophan:36,atom:17,attach:[5,6],attack:[50,56],attempt:[39,51],attribut:16,audio:[1,6,35],auth:[30,32,4
 1,54],authent:[15,17,27],author:[12,31,38,51,53,54,59,64],author_uuid:18,authorid:[16,18],authorimag:18,authornam:18,authoruuid:18,authrespons:54,auto:[30,32],automat:[6,7,15,17,21,25,26,32,34,35,44,52,54,55,58,59,63],avail:[12,15,17,23,26,28,31,35,52,62,64],avatar:[12,14,28,59,60,65],avoid:[18,62],awai:18,awar:[11,12,23],awssdks3binarystor:2,b0c6:60,b11217fc:7,b1f7:15,b24e:7,b2bd:60,b2e4:17,b31d:53,b36a:[3,34],b379:6,b3u68vghi6fmeekn9wlogtzz0a:37,b3u6aaabmqz:52,b3u6zuz5_u8i:37,b4c6:3,b690:60,b6dd:59,b77ec8addc0d:60,b90c:60,b93d:65,baa:[36,39,50],back:[16,18,31,35,42,62],backend:[14,29,34],bad:[39,52,57],banner:8,bar1234b:65,bar:28,barnei:[21,60,63],base:[0,15,23],batch:[12,13],baz:28,bcc1:9,bcf7:[3,36,39,59],bcf8:[36,39],bd397ea1:58,be04:15,be08a5f9:39,be09a5f9:39,bean:2,bearer:[31,51],beca:39,becaus:[12,16,21,23,27,30,44,52,56,57,59,62],becom:[13,14,23,30,35,59,60,61],bedrock:12,been:[7,18,51,54,55,56,59],bef8:[36,39],befor:[0,2,26,27,32,33,44,54,56,65],begin:[9,12,13,38],behalf:5
 2,behav:62,behavior:35,behind:[26,41,54],belong:[31,34,41,59,61],below:[12,15,16,17,18,30,32,36,54,59,60,62,65],beneath:62,benefici:33,benefit:[16,30],best:[13,14],better:[18,52,57],bewar:32,beyond:59,bike:11,bin:32,binari:[1,35,51,52,56,57],binarystor:2,bit:16,block:33,board:62,boat:[11,12],boavijt0oyrkjf:37,bodi:[7,18,36,37,39,44,53,59,60,65],book:[12,13,35],border:43,both:[7,12,16,19,32,33,34,42,44,57,64],bounc:18,bouncer:18,bounci:[16,18],box:[25,27,62,64],bracket:17,bread:[15,17],brief:[33,54],broad:[51,52,57],browser:[30,32,36,54],bucketnam:2,buildcurl:54,built:[12,18,28,30,59],busi:23,button:[8,25,27,36,62,65],button_click:[7,9],c2v7n61dy90mcdg78xixprxfdq:39,c2v7wedxiutzwekwdyslct_lydfvmmn:39,c5e707256e71:17,california:[36,60,61],call:9,callback:[33,54],campaign:35,can:[0,1,2,3,5,6,7,8,9,11,12,13,14,15,16,17,18,19,21,22,23,25,26,27,28,30,31,32,33,34,35,36,37,38,39,41,42,44,50,51,52,53,54,56,57,58,59,60,61,62,63,64,65],cancel:[44,54],cancelmsg:29,cannot:[15,17,28,33,34,57],cap
 abl:56,captcha:[36,44,65],captur:[12,14,18,23,35],car:11,carefulli:57,carri:38,cassandra:[16,18,29],cast:43,castl:[16,18],cat:31,catalina:32,catalog:35,categori:[16,36,39,44],caus:[0,17],caution:53,cautiou:[51,52,57],ccc:43,cd0c:[3,36,39,59],cd0d:[36,39],cd789b00:60,cd796d0a:60,cdf1ce04c1c0:[12,14],cdn:35,cede5b7:39,cede5b8:39,cell:0,center:23,central:[0,2],certain:[12,17,18,34,44,55,64],cf3e981c:36,cf4d981c:[36,39],cf9b:9,cfed:[20,22],chain:7,challeng:[28,36,44,65],channel:54,channelurl:54,charact:[13,59,65],charset:[36,65],check:[27,30,31,54,57,58,59],checksum:[3,6],chicago:65,choos:18,circl:[35,59],circumst:55,cite:17,citi:[13,36,44,65],clara:43,classpath:2,claus:12,clean:[0,30,31,32,36],cli:30,click:[8,18,25,27,38,62],client:[10,12,13,15,16,17,18,28,29,30,33,35,36,37,38],client_credenti:[37,52],client_id:[37,39,44,51,52,54],client_secret:[37,39,44,51,52],climb:18,clone:[0,30,32],closer:18,cloud:[2,5,6,35],clue:30,cluster:30,cluster_nam:32,cn0wtdxxkxmqlgzvtmubcp20fulczq:52,code:[
 2,12,13,18,28,29,30,31,33,35],coffe:16,colleagu:59,collect:[5,6,12,14],collection_nam:15,collectionid:44,column:[12,16,18],com:[3,5,6,7,9,12,14,15,16,17,18,19,20,21,22,23,28,30,31,32,34,36,37,39,41,52,53,54,55,58,59,60,62,63,64,65],combin:[18,56,65],comma:[12,14,44,54,58],comma_separated_list_of_permission_nam:54,command:[0,26,30,31,32,49,54,60],comment:[35,59],commit:0,committ:42,common:[12,14,56,59,65],commun:62,compani:[38,39,62],compar:[12,14],comparison:12,compil:[51,52,56,57],complet:[14,30,33,34,35],completemsg:44,complex:[17,18,29,35],compliant:35,complic:30,compon:[34,35],compromis:51,concept:[16,26],config:32,confim:44,confirm:[30,32,36,39,44,62],confirm_email:[36,39,44],conflict:62,conform:[11,12],conjunct:[35,64],connect:[0,3,6,12,14,18],connected_collect:[19,20],connected_ent:[19,20],connecting_collect:[19,20],connecting_ent:[19,20],consid:[52,56],consider:[51,52,57],consol:29,constrain:16,constructor:2,consult:26,consum:[35,59],contain:[11,12],containslook:13,containsw
 il:13,content_typ:5,context:[2,35],contextu:35,continu:[12,13,33,62],contrast:[18,63],contribut:29,contributor:42,control:[35,53,56,65],conveni:[10,51,60,62],convent:34,convert:12,cooki:54,copi:[0,18,30,62],core:[31,32,35],cores:32,correct:[41,54,62],correspond:[12,14,15,17,28,34,44],cost:35,costli:18,could:[3,12,13,18,21,33,51,52,56,57,60,61,63,64],count:[8,9,12,14,15,16,17,59],counter_nam:[7,9],creat:[1,3,6],createact:29,createadminus:29,createapp:29,createent:[29,33],createev:29,creategroup:29,createnotif:29,createorg:29,createus:29,creation:[1,41,53,61],credenti:[29,30,32],credential:32,criteria:[12,35],cross:59,css:[36,65],cumul:7,curiou:26,curl:[5,6,7,9,10,12,13,14,15,17,19,20,22,23,31,32,36,37,39,52,53,54,55,58,59,60,65],current:[7,15,23,34,44,58,59,65],cursor:12,custom:[10,15],custom_id:10,d0d7d0ba:[12,14],d16344f5a0e1:23,d20976ff:60,d28c:28,d503:[3,34],d7a8:17,d86a:[12,14],d878de4r:53,d87edec7:59,d9693ec3:59,da448955:59,da4a50dc:17,da67:65,da71:65,da83:59,dai:[8,9,53],daili
 :9,dashboard:54,data:[1,2],databas:[12,13,16,18,23,29],datacli:[10,52,55],date:[11,12,44],dave:43,david:43,db1e60a0:[19,60,65],dbf5228024a7:[20,22],dbm:[13,14,16,18],dc5d478e9c029853fbd025bed0dc51f8:28,decim:[11,12],decompil:56,dedic:7,defin:[8,12,16,17,27,32,34,35,50,51,52,53,57,58,59,60,64,65],definit:58,degre:53,delet:[12,13,14],delimit:[11,12,44,58,61],deliv:[35,44],deliveri:[35,44],denot:[21,60,63],depend:[28,60,61],deploi:29,deploy:29,desc:[12,13],descend:13,describ:[13,14,15,17,18,23,28,38,41,50,51,52,54,60,62],descript:[1,5,6,7,9,12,13,15,16,17,19,20,22,29,34,36,37,38,39,41,44,52,57,58,59],design:[16,18,23,30,35,59,60,61,62,64],destin:2,destroi:55,detail:[15,17,26,34,35,36,37,38,39,44,52,54,59,60,62,63,65],detect:[6,12,23],determin:[12,23,59,65],dev:[32,54],develop:[11,12,23,27,34,35,44,56,62,64],devic:[6,12,20,22,23,25,28,29,34,35],deviceid:44,dfr4d5m1mjmoeeogvpncm:53,dialog:[25,27,36],did:17,differenti:35,dimens:64,diner:[12,13],dino:[21,28,63],dir:0,direct:[0,18],directli
 :[0,37,57],directori:[0,30,31,32,42,54,62],disabl:[27,30,36,39,41,44],discuss:62,displai:[9,12,13,23,41,44,54,59,61,62],displayemail:44,displayemailaddress:[36,39],displaynam:[36,39,44,59],distanc:[12,23],distance_in_met:23,distribut:[16,18,56],div:[36,65],dk88fh4r:22,doctyp:[36,65],doe:[0,1,17,21,28,34,41,44,51,52,53,54,59,60,65],doesn:[16,18,27],dog:[17,21,28,33,60,61,63],dogcreatecallback:33,doge:[60,61],domain:54,don:[30,56,59,65],done:[0,30,35,54,56,57,65],dot:[7,11,12],down:[11,12,25],download:29,drive:[2,35],drop:25,dropdown:25,dskiptest:[30,31,32],dtd:[36,65],due:[13,14,18,52],duplic:18,durat:[3,6,7,9,12,14,15,16,17,18,19,20,22,28,30,36,37,39,53,55,58,59,60,65],dure:56,e13743a7f1db7f4246badd6fd6ff54ff:65,e694:60,e7127751:60,e7d0:59,e8f5:17,e94123890c7a:17,e978:65,e97b:[12,14],each:[0,7,8,9,11,12,14,15,16,17,18,23,27,28,34,36,41,54,57,59,60,65],eas:35,easi:[0,12,35,64],easier:[10,12,13,14,18,27,28,56,60,63],easili:[7,23,34,35,56,64],east:30,easy_instal:0,eb20e5bce407:19,ebc6f
 49d1fc4:17,ec39:28,edit:[0,2,29,30],edort1:36,ee912c4b:[11,12],ef0b:17,effb:17,effect:35,effici:[14,18],either:[2,15,19,51,54],elasticsearch:32,elev:56,elimin:[35,51,56],els:[33,54],email:[12,14,28,30,31,32,34,36,39,41,44,52,59,60,62,65],email_address:[28,65],embed:32,embed_cod:43,employe:60,empti:[15,62],emul:[59,60,61],enabl:[23,30,35,41,54,56,59],enclos:[12,14,44],encod:[10,12,13,14,17],end:[9,35],end_tim:9,endpoint:[0,7,20,37,41,44,51,52,54,55,59,65],engag:[23,35],enhanc:[12,23],enough:27,ensur:[11,18,28,35,50,52,56],enter:[25,27,36,54,62,65],entir:[13,44],entit:18,entiti:[0,1,3],entity_nam:17,entity_typ:17,entity_uuid:17,entityid1:44,entityid2:44,entityid:44,entityproperti:44,entitytyp:[36,39,44],entri:[13,54],environ:[26,44,56],equal:[11,12,14,53],equiv:[36,65],equival:12,err:[33,54],error:[7,29,33,39,41],errorcod:44,errormessag:44,essenti:64,establish:[21,44,59,64],etag:[3,6],etc:41,evalu:30,even:[9,12,13,18,30,34,51,52,56,57,63],event:7,everi:[9,10,28,34,51,56,57,60,61],ever
 yth:[0,28],exact:[12,23,64],exactli:[12,13],examin:[9,56],exampl:[0,1,2],except:[12,17,51,56],execut:[10,12,13,14,33],exhaust:56,exist:[6,7,17,18,23,30,39,41,44,53,54,59,60],expect:[11,12,23,36,39,64],experi:[12,16,23,35,64],experiment:[27,50],expir:[29,44],expires_in:52,explain:[0,30],explan:33,explicitli:[51,55],expos:31,express:13,extend:[21,63],extens:62,extern:42,extract:[30,31,32,51,52,54,57],f18e8f6fb3bc:65,f315e5aa568a:17,f34f4222:[6,7,9,15,17,28,58,60],f399:59,f3a8061a:17,f3aa:59,f3be262a:17,f3teeg:37,f8zemolceecubwbqvsaaca:52,f_gubelxeecfrgbqvsaaca:52,facebook:[28,29,35],facebookaccesstoken:54,facebooktoken:54,factor:30,fail:44,failur:16,fals:[11,12,30,32,36,39,44],famili:[16,23],familiar:[12,18,26],faq:30,far:25,fast:16,favorit:65,fb_access_token:[41,54],fbasynchinit:54,fbasyncinit:54,fc4d:59,fdd3:39,fe80:36,fe90:[36,39],featur:[18,21,23,26,28,29],feed:[6,12,14,20,22,28,29,35],feel:32,few:[12,13,23,62,64],ffd79647:59,field:[2,12,13,17,35,36,44],fieldset:[36,65],file_loc:6
 ,filenam:6,files:2,filter:[14,59,60,65],find:[0,12,13,23,30,56,60],fine:[32,35],finish:[44,62],first:[12,13,14,15,18,21,26,28,32,33,36,41,56],first_nam:28,firstnam:[12,13,14,41],fish:31,fit:57,five_minut:9,flexibl:[16,18,29,34],flow:[54,65],fluffi:31,fobnszewobnioerabnoiawegbrn:6,focu:[28,35],folder:2,follow:[0,3,5,6,7,9,10,11,12,13,14,15,16,17,18,20,21,22,23,26,27,28,29,30,31,32,33,34,38,41,50,51,53,54,56,58],foo9876a:65,foo:28,force_refresh:32,ford:[20,22,63,64],forgot:65,fork:42,form:[17,21,34,36,39,44],format:[0,3],fortun:9,forward:[54,60],found:[12,37,51,52],four:[52,57],foursquar:59,fragment:54,framebord:43,framework:62,francisco:[23,36,60,61],fred:[12,13,21,60,63],free:[32,34],friend:[20,23,35,59],from:[0,5,10,12,13,14],full:[13,17,27,35,36,38,51,52,56,57,63],fulli:[28,32],further:[12,28,33,38,41,51,54,56],furthest:[13,23],futur:[17,56],g9qgaaaurv_lfq7uu6ayhjjjn7qcrgovnvu:53,gain:[51,56],game:8,gaufeolxeecfrgbqvsaaca:52,gcm:44,gem:49,gener:[0,7,8,28,29,31,32,34],geo:29,geocoo
 rdin:23,geograph:13,geoloc:[12,13],get:[3,5,9,12,13,14,15,16,17],ggkaaqmaggkabge5ffm1aqcadqaq_9ewr_ozeeguwxixowauaqcadqaqablaovoaeeguwxixowauaqa:59,ggkaaqmaggkabge5mlfh7gcadqaqjikhxefqeegw9hixowbregcadqaqjnep6ufqeegw9hixowbrega:59,ggkaaqmaggkabge5xc3r1gcadqaqz02yhp6qeegvybixoxisvgcadqaqz3soh_6qeegvybixoxisvga:39,ggkaaqmaggkabge5xc3r1gcadqaqz02yhp6qeegvybixoxisvgcadqaqz4zbyf6qeegvybixoxisvga:36,ggkaaqmaggkabge7pehcgwcadqaqvj9dljfzeekg9wloguza3acadqaqvkvrctfzeekg9wloguza3aa:59,git:[0,42],github:[30,42],give:[7,12,18,27,28,35,53,58,64],given:[17,18,27,34,39,43,44,51,56],gladi:[12,14],gmail:[32,36,59,65],goal:13,goe:30,gold:31,good:[0,27,56],googl:[35,36,44,59,65],govern:[50,52,57,60],grain:35,grant:[28,51,52,54,56,57],grant_typ:[31,37,52,53],grant_url_pattern:44,granular:[7,9],graph:[29,35],graph_async:32,graph_us:32,gravatar:[12,14,28,59,60,65],great:[35,41,60,61],greater:[11,12,13,53],greatest:57,groovi:0,group:[6,12,14,16,17,20,22,28,29,34],groupid:44,groupnam:[59,60],grouppath:60,g
 roupproperti:44,gte:[11,12],guarante:33,guest:[27,51,56,59,65],guid:[10,30,42,54],hacker:[51,52,56,57],half_hour:9,hand:18,handi:26,handl:[25,35,36,64],happen:23,happi:[0,59],happy_cloud:6,hard:[2,57],hava:0,have:[0,1,12,14,16,17,18,22,26,28,34,37,39,41,44,52,53,54,56,57,59,60,61,62,64,65],head:[36,65],header:[5,51],height:[43,59],hello:59,help:[8,12,13,16,34,35,50,52],hemingwai:12,her:[18,36],here:[3,12,14,18,21,23,28,30,31,34,42,54,59,60,62,65],hierarchi:[7,34,38,39,58,60],high:[16,18,50,53],higher:[31,57],highest:[38,39],highlight:18,hike:57,him:31,hold:6,home:23,homepag:7,host:[30,32,51,54],hotmail:39,hour:9,hous:18,howev:[1,9,12,13,14,15,17,32,33,34,41,54,56,59,62],href:[36,39,65],html4:[36,65],html5:[28,29],html:[0,36,44,52,54,62,65],htmldisplayemail:44,htmldisplayemailaddress:[36,39],http:[3,5,6,7,9,12,14,15,16,17,18,19,20,21,22,23],human:[36,65],hundr:[12,13],hurrai:54,hystrix:32,icon:[59,62],idea:56,ident:18,identif:44,identifi:[10,18,34,36,41,65],ifram:43,illustr:[16,50],i
 mag:[1,3,5,6,16,35,44,59],imagemodel:29,imagin:[12,14,18,57],immedi:[35,65],immut:34,implement:[28,35,50,51,52,54,57,65],improv:[23,35],inbox:[41,59,61],includ:[7,12,13,14,16,17,18,25,26,27,28,34,35,36,44,51,52,53,54,56,60,65],incorpor:62,incorrect:[28,36],increas:[15,23,35],increment_valu:7,incub:[30,32,42],index:[0,11,12,13,17,32,34,62],index_prefix:32,indic:[12,44,53,59,60],indicet:44,individu:[17,34,53,57],ineffici:[13,14,18],inflat:18,info:[36,44],inform:[5,9,13,14,15,16,17,18],infrastructur:[34,35],ing:59,inher:56,init:54,initi:10,initil:32,inner:18,input:[32,36,65],insecur:56,insert:54,insid:28,instal:[0,10,26,28,29],instanc:[30,31,34,52,55,62],instead:[18,28,32,35,52,56,57],instruct:[0,30,54,62,65],integ:[12,13,44],integr:[23,28,35,54],intend:34,intention:18,interest:[9,35],interfac:[30,62],intern:29,interpret:[28,58],intersect:[11,12],intrins:28,introduct:29,invalid:[41,54],iphon:62,isn:[12,16,26,28,50],iso:[36,65],issu:[0,3],item:[11,12,14,15,17,28,59],items:15,itself:18,j
 ane:65,jar:31,java:[0,30,31],javascript:[7,10,12,14,16,28,29,30,33,36],javscript:33,jdk:[30,31,32],jdoe57:34,jenni:18,jim:36,jin:43,jinm:36,john:[28,34,52,59,60,65],johnson:43,join:18,jpeg:[1,3,5,6],jpg:[3,6,16,18],json:[11,12,14,16,17,18,22,28,31,34,36,37,54,59,60,64],json_arrai:17,json_object:17,just:[16,18,19,21,23,27,28,30,59,64],k88dh4f:20,keep:[2,8,10,12,13,14,27,35,51,52,56,57],kei:[15,17,18,28,35,54],keyspac:[30,32],keyword:17,kid:18,kind:[12,13,14,18],know:9,krav:12,kravitz:[12,14],label:36,lack:27,lag:33,languag:11,larg:0,last:[6,12,13,34,39,41],lastnam:[12,13,14,41],latenc:33,later:[18,23,44],latest:[30,31],latitud:[12,13,23],latitude_coordin:23,launch:[9,56],launcher:29,layer:31,lceecubwbqvsaaca:52,learn:[26,27,35,56,62,64],least:30,leav:30,left:[25,59,62],length:[3,6],less:[11,12,16,53,59],let:[9,31,35],letter:65,level:[7,9,16,17,25,26,27,29,31,34,35,37,38,39,50,51],leverag:[35,62],lib:[30,32],librari:49,lightweight:64,like:[0,3,6,9,11,12,16,18,19,20,21,22,27,30,32,33,3
 5,36,41,54,56,58,59,61,62,63,64,65],liked_bi:63,limit:[2,12],line:[0,18,30,31,49],linear:[16,30],live:[27,29,51],load:[31,54],localfilebinarystor:2,localhost:[30,31,32],locat:[6,12],log:[7,30,35,41,52,54,55,59,62,65],logic:12,login:29,loginfacebook:54,logout:29,longer:[12,13,56],longitud:[12,13,23],longitude_coordin:23,look:[3,9,11,12,13,18,54,57,59,65],loos:[36,65],love:18,lower:7,lte:[11,12],ltixndg0nduxndpnr2tbqvffqwditufdwfj2ylm1emjxbdbhqunbzffbuuqymvzneexfrwvlrlv3tg9hc1dozxddqwrrqvfiyvdjb0jwrevls1vcd0xvr3nwt0jrqq:12,ltixndg0nduxndpvdjb0jwrevls1vcd0xvr3nwt0jrqq:13,made:[12,22,28,58,63],magic:18,mai:[0,7,10,15,17,27,34,55,56,60],mail:[30,32,34,60],mailer:[30,32],mailto:[36,39],main:[0,2,54],maintain:[18,54],make:[0,10,12,13,14,16,18,21,26,27,28,32,33,34,35,38,41,51,52,54,55,56,59,62,63,64,65],makefil:0,maker:16,malici:[50,51,52,57],manag:[1,6],mandatori:[1,2,41,44,60,61,65],mani:[8,12,13,14,16,18,23,27,34,64],manual:[59,63],map:16,marginheight:43,marginwidth:43,mark:12,massoddb:5
 9,match:[12,13,17,58,65],matter:35,mattress:16,maven:[0,30,31,32],max:32,maximum:[12,13,53],mayb:18,mean:[11,16,17,18,27,33,34,50,51,56,63,64],meant:59,meanwhil:33,measur:50,mechan:62,meet:30,member:[12,34,36,38,44,57,59,60,61],meme:[60,61],memori:23,menu:[25,37,62],messag:[7,12,30,32,35,36,44,53,60,62,64],message:[21,29],meta:[36,65],metadata:[3,5,6,7,11,12,14,15,16,17,18,19,20,22,23,28,29,36,39],metadataproperti:44,meter:[12,13,23],method:[7,9,12,13,17,21,22],mfdsadfdsaoabl:59,middl:41,middlenam:41,might:[8,9,10,12,13,14,16,17,18,26,30,34,35,37,56,60],mile:[12,23],milk:[15,17],million:35,millisecond:[34,44,53],mind:[2,10,12,13,14,18,23,27],minim:[18,30,32],minimum:[34,37,39],minu:18,minut:[9,35],mirror:21,mix:28,moab:59,mobil:[16,18,23,27,29,37],model:[1,16],modern:[34,59],modif:[1,41,61],modifi:[1,3,6,7,12,14,15,16,17,18,19,20,22,23,28,34,36,39,41,44,53,59,60,61,65],modul:[7,49],monitor:35,month:[9,35],more:[5,7,9,10,12,13,14,15,16,17,18,23,25,26,27,28,29,30,34,35,39,42,44,50,52,
 53,55,56,57,58,59,60,62,63,64,65],morn:9,most:[9,12,13,18,21,26,32,33,34,35,37,56,59,63,64,65],mountain:57,much:[11,16,18,56,62],multi:17,multipl:0,must:[0,11,12,17,18,31,32,34,39,44,51,53,59,60,62,63,65],mustach:0,mvn:[30,31,32],my_app:[16,18,41,54],my_org:[16,18,41,54],myadmin:31,myapp:[12,14,31],myasset:3,mycollect:[11,12],myfirstorg:31,mygroup:[59,60],mynewapp:[60,65],mynewgroup:60,mynewpassword:36,myorg:[12,14,60],mypassword:31,myself:[18,30,32],myuser:31,name:[1,2,3,5,6,7,9,11,12,13,14,15,16,17,18,19,20,21,22,23,25,27,28,30,31,32,34,36,37,39,41,44,51,53,54,56,58,59,60,61,62,65],narrow:11,nativ:[0,16],natur:[13,14],navig:[30,31,32],nearbi:23,nearest:[13,23],nearli:18,necessari:[18,35],need:[0,2,3,9,10,12,13,14,15,16,17,18,25,26,28,30,32,34,35,36,37,38,39,41,44,51,52,54,55,56,57,59,60,62,63,64,65],neg:7,nest:[17,34],net:[28,43,49],network:35,never:[27,29,37,51,52,53],new_password:[36,65],new_review_uuid:18,newli:[58,59],newpassword:[36,44,65],next:[12,13,15,25],node:[28,30,32,52
 ,55,59],nodej:32,non:[16,18],normal:[5,17,18],nosql:[13,14,16],notat:[11,12,14,16],note__:65,notic:[6,18,22,54,59],notif:[23,26,29,30,32,34],notifi:[29,34],notificationid:44,notify_sysadmin_of_new_admin_us:[30,32],notify_sysadmin_of_new_organ:[30,32],notitf:44,now:[21,30,31,32,54,62],number:[7,8,12,13,14,15,16,34,35,44,56,59,65],oauth2:44,ob5ko:53,object:[1,6,10,11,12,14,16,17,28,29,34,35,36,37,39],objectproperti:44,objecttyp:[36,39,44],objectuuid:44,obtain:[41,51,53,54,56],occur:[8,23],occurr:[12,13],octal:[11,12],off:[30,54],offer:[23,27,28,35,56,63,64],offici:62,often:[9,11,12,18,34,35,59],old:[36,44,65],old_password:[36,65],oldpassword:[36,65],omit:[12,14],onc:[0,12,13,18,30,33,54,56,65],ongo:[35,59],onli:[6,10,12,13,14,18,21,25,27,28,30,33,34,37,50,51,52,53,56,57,58,59,60,63,65],onlin:59,oop:54,open:[16,18,27,29,32],optim:[13,14,16,18],option:[6,10,30,32,34,51,54],order:[3,12],orderl:13,org:[2,3,5,6,7,9,14,15,17,19,20,21,22,23,28,30,31,32,36,37,39,44,51,52,53,55,58,59,60,63,64,
 65],org_client_secret:52,org_clientid:52,org_id:[17,44,59,60,65],org_nam:[12,37,39,53,55],org_uuid:[37,39],organ:[0,3,5,6,7,9,12,14,15,16,17,18,19,20,22,25,27,28,29,30,31,32],organizationnam:53,organizations_require_activ:[30,32],orgid:44,orgnam:[10,44,52,54],orguuid:44,origin:60,originali:61,oscar:31,our:[0,10,12,13,14,21,30,31,32,42,64],out:[12,13],outbox:59,outgo:32,outlin:6,output:54,over:[9,53],overrid:[32,53],overview:[13,14,29,34,35],overwritten:17,own:[8,27,35,44,54,58,59,60,61,65],owner:[1,3,39,44,59,60],packag:[30,54,62],page:[26,27,31,36,52,54],pair:[12,15,17],param:[3,6,7,9,12,14,15,16,17,18,19,20,22,28,53,58,59,60,65],paramet:[5,6,7,9,10,12],pars:54,part:[10,12,13,14,18,23,28],partial:[13,34],particular:[11,12,18,59],particularli:[16,18,58,59,63],partit:26,pass:[12,13,37],passiv:64,password:[28,29,30,31,32],path:[1,3,6,7,12,14,15,16,17,18,19,20,22,23,27,28,29,30,32,36,39,44,54],path_to_imag:18,pathnam:54,pattern:[44,58],payload:44,peak:9,peopl:[8,34,59,60,61,62],per:[15
 ,16,54],perceiv:33,perform:[5,6,15,16,18,20,33,35,36,38,41,51,52,57,58,59,61,65],period:[8,9,23],perl:49,permiss:[6,12,14,20,22,27,28,29],permissiondata:44,persist:[28,31,32],person:[18,23,36,39,62],perspect:34,pertin:38,pet:31,phone:[12,14,49],phone_numb:[12,14],photo:[23,64],php:49,physic:[12,23],pictur:[5,6,12,14,23,28,41,44,60,65],pinterest:59,pip:0,place:[16,17,18,30,34,52,65],plai:[8,26],plain:5,plan:18,platform:35,pleas:[11,36,51,53,63],plenti:0,plural:[15,17,34,44],png:18,point:[11,12,13,16,23,32,33,35,54,62],polici:[42,56],pop:62,popul:[21,60,62,64],popular:[35,62],port:[30,31,32],portal:[25,26,27,30],portion:44,pose:53,posit:[12,13,23],possibl:[18,56,63],post:[3,6,7,8,12,15,17,18,19,20,21,25,27,28,29,31,36,37,38,39,44,51,52,53,56,58],postal:[12,13],potenti:[12,13],power:[23,31,34,35,43,52,57,63],practic:[13,14],preced:[12,14,18],precis:59,predefin:34,prefer:[12,13,28,30],prefix:37,prepar:56,present:[18,29],preserv:60,prevent:[13,14],preview:0,previou:[59,62],previous:62,pr
 ice:[11,12,15,17],primari:[18,41],primarili:1,prior:56,privaci:59,privat:35,privileg:39,probabl:[0,18,30,33],process:[31,34,36,64],product:[16,18,25,27,29,30,34,44,50],product_uuid:[16,18],productid:18,productimag:18,productnam:18,productuuid:18,profil:[23,35,41,54,64],program:33,programmat:[25,37,57],project:[0,31,38,39,42,62],prompt:[30,54],prone:59,proof:[36,65],properit:23,properli:[31,33],properti:[1,2,5,6,7,10,11],properties____:30,property_1:[15,17],property_2:[15,17],property_nam:[12,13],propti:36,protect:[50,52],protocol:[30,32,54,56],prototyp:54,provid:[7,9,12,13,15,16,17,23,25,28,32,34,35,36,37,39,41,44,51,52,54,56,57,59,60,62,65],provis:[41,54],proxim:[13,23],pure:28,purpos:[11,27,30,34,37,64],push:[0,23,26,29],put:[6,12,14,15,17],pw123:30,pwhere:32,python:0,qualifi:28,quantiti:11,query_stat:[12,14],query_str:[60,65],querystat:44,queue:44,quick:29,quicker:28,quickli:[13,14,18,34,35,64],quitwait:[30,32],quot:[14,44],quotat:12,radiu:12,rail:49,raleigh:43,rang:9,rate:18,rat
 her:[6,18,19,20,35],raw:0,rdbm:[16,18],reach:[11,12],reactiv:29,read:[10,12,13,14,16,18,26,42,44,59],readabl:18,readi:[12,13,26,32,62],readm:[0,42],real:44,reason:60,recaptcha:[36,65],recaptcha_challeng:44,recaptcha_challenge_field:36,recaptcha_respons:44,recaptcha_response_field:36,recaptchaopt:36,receipt:[29,34],receiptid:44,receiv:[12,13,33,41,61,62,65],reciproc:63,recommend:[30,56],record:[34,35],recurs:58,redirect:[30,32,54],redirect_root:[30,32],redirect_uri:54,reduc:[14,18],redund:18,ref:44,regard:[7,34],regardless:17,regionnam:2,regist:[35,50,57,62,64,65],rel:[1,36,65],relat:[6,12,16],relationship:[18,19,20],relev:[23,35,44,54,56,64],reli:18,rememb:[11,12,54,62],remind:18,remot:[12,23],remov:[27,29,30,36],renam:34,repeat:62,replac:[2,18,21,54,62],replic:30,replication_factor:[30,32],repo:[30,32,42],report:8,reposloc:2,repres:[13,16,25,28,34,35,36,39,57,58,59,60,65],represent:[12,13,17,28,34],request:3,requir:[0,7,15,19,20,23,27,29],resembl:12,resend:44,reserv:34,resetpw:[29,
 30,32,36],resetpwmsg:29,resolut:9,resourc:[0,2,28,38,41,44,51,54,57,58],resource_path:[44,58],respect:51,respons:3,response_typ:54,restaur:[12,13,23],restkit:62,restrict:56,restructuredtext:0,result:11,review_entity_json:18,review_uuid:18,reviewed_product_uuid:18,reviewedbi:18,reviewedin:18,revok:[29,51,53],revoketoken:55,rich:[35,64],right:[18,28,33,59,62,64],rigid:34,risk:53,rock:[11,12],rockadero:[12,23],rocki:57,role:[6,11,12,14,20,22,25,27,28,29,34],roleid:44,rolenam:[6,12,14,20,22,28,41,44,60,61,65],roleproperti:44,root:[0,30,31,32,56],rout:[35,59],row:16,rubi:[28,49],rule:[27,35,50,51,52,56,57,58,60,65],run:[0,8,29],safe:[52,57],sai:[9,51,52,59],said:12,sake:32,same:[6,7,13,18,20,22,23,32,34,35,57,59,60,61,62],sampl:[21,59,60,62,65],san:[23,36,60,61],sandbox:[6,17,26],santa:43,save:[6,17],scalabl:[16,18,30],scale:18,scatter:18,scene:[41,54],schedul:44,schedulenotif:29,schema:[16,34,44],scope:[18,31,52,54,57],screen:[25,43],script:[0,36,57,65],scroll:43,sdk:[7,10,16,17,26],sea
 rch:[9,12,13,35],second:[7,33,36,53,62],secondari:18,secret:[29,37,44],secretkei:2,section:[28,37,51,52,60,62,65],see:[3,5,9,10,11,12,13,14,15,16,17,21,22,23,25,26,27,28,30,31,34,35,36,37,38,39,42,50,51,52,53,54,56,57,58,59,60,62,63,65],seen:59,segment:58,select:[11,12,13,14,18,25,27,28,60,62,65],self:54,send:[2,5,10,12,13,14,22,23,31,35,36,39,41,44,54,62,64],sens:[18,35],sensit:[27,50],sent:[10,12,14,28,36,37,39,44,51,52,58,62,65],separ:[7,12,14,18,34,54],seri:0,serv:[56,57],server:[12,13,27,30,33,35,37,51,52,54,55,56,57,60,62],servic:[2,12,14,23,27,28,31,35,36,38,39,41,44,50,52,54,59,60,62,65],session:[54,56],set:[0,5,6,7,9],setexpir:29,settoken:54,setup:29,sever:[2,28],share:[31,39,59,64],shell:26,shortcut:12,shorthand:[12,13],should:[0,3,12,13,14,17,18,19,20,26,27,30,32,42,44,50,51,52,53,56,57,62],show:[14,15,18,62],shown:[10,12,13,14,15,17,22,36,51,54,59,60,65],side:[35,37,51,52,54,56,57,62],sign:[29,30,32,34,35],similar:[18,21,59,62],simpl:[0,16,18,21,27,30,34,35,62,64],simple
 strategi:[30,32],simpli:[15,22,28,35,59,62],simplifi:[18,35],sinc:[11,13,33,51,57],singl:[9,14,16,17,18,30,34,35,44,60],singular:34,six_dai:9,skim:17,sku:[16,17],slash:[60,61],slate:12,slideshar:43,slideshow:43,slightli:16,slower:11,small:30,smith:[12,13],smtp:[30,32],snippet:54,social:[23,29],softwar:32,sojre5ywlkq7jrdcka:52,solid:43,solut:34,solv:35,some:[0,2,8,10,13,18,28,31,33,34,56,59,60,62],somegroup:60,someon:9,somepassword:[30,53],somesubgroup:60,someth:[3,18,30],sometim:[0,16],someus:[28,30,53,55,60,65],sourc:[16,18,29],space:18,span:[9,18],sparingli:57,special:[0,23,58,63],specif:[8,11,12,13,16,17,18],specifi:[7,12,13,14,15,17,19,20,22,23,28,30,38,39,44,51,52,53,58,59,60,62,65],split:9,sql:[11,12,18,35],squar:17,src:[0,2,36,43,65],stack:[2,29,30,31],stage:32,standalon:31,standard:[23,28,56,57,65],start:[9,12,13,14,16,18,26,28,29],start_tim:9,startup:31,state:[28,36,44,54],statement:[12,14,33,44],statist:8,statu:[14,30,31,32,36,39,44,54,64],steventraut:[60,65],still:[26,56]
 ,stock:[15,17,30],stop:[12,13],store:[2,6,11,12,13,14],str:59,strateg:18,strategi:[30,32],stream:23,streamlin:[18,62],street:12,string:[1,10,11,12,13,14,15,17,18,34,36,37,39,41,44,51,54,59,60,61],stringifi:54,strong:36,stronger:23,structur:[12,18,21,28,31,38,63],struggl:59,style:[35,36,43,50,59,62,65],stylesheet:[36,65],sub_properti:17,subgroup:60,submit:[13,14,36,42,58,65],subscrib:[21,59,60,61],subscript:[60,61,63],subsequ:[41,51,52,54],subset:[15,18],substitut:59,subtract:[11,12],succe:[41,54,58],success:[30,33,56],sudo:0,suggest:[23,27],suit:[52,57],summit:43,sungju:43,superadmin:30,superus:[30,32],suppli:[36,39,44,52],support:[0,9,11],suppos:17,sure:[12,25,27,32,50,56,62],swagger:0,symbol:65,sync:29,synchron:29,sysadmin:[30,32],system:[0,1,16,30,32,34,41,42,53,59,60,62,65],tag:54,take:[7,12,13,18,32,33,35,50,52,56],taken:[12,23,54],tale:[11,13],talk:[43,56,62],tar:54,target:[0,30,31,32,35,44],team:[38,39,62],technic:54,techniqu:[13,18],temp:2,templat:0,temporari:2,tempt:18,tend
 :[60,61],test12345:[36,39],test1234:65,test123:[36,39],test:[6,12,13,27,30,32,39,56,57,60,62],testadmin:52,testadminpw:52,testapp1:[37,39],testapp2:39,tester123:39,tester:44,testorg:[37,39],testpw:52,text:[5,11],text_field:36,than:[0,6,7,9,11,12,13,14,15,18,19,20,30,35,53,56],thank:35,thei:[0,12,13,14,17,18,21,23,34,39,50,51,52,56,57,59,60,61,65],them:[0,7,10,11,12,13,14,18,27,28,35,52,54,57,59],theme:[18,36],themselv:65,thereaft:50,thi:[0,2,3,7,9,10,11,12,13,14,15,16,17,18,21,23,25,26,28,30,31,32,33,34,35,36,37,41,42,44,50,51,52,53,54,55,56,57,59,60,61,62,63,64,65],thing:[8,11,12,26,27,43,50,60,61,65],think:59,those:[12,13,18,42,50,51,52,56,57,59,65],though:[12,13,18,44],thousand:16,threadpool:32,three:[7,12,13,30,57,62],through:[16,18,21,25,35,37,38,39,41,44,50,54,56,57,59,60,65],thu:12,thumb:27,tier:31,time:[7,8],timeout:32,timestamp:[1,3,6,7,9,11,12,14,15,16,17,18,19,20,22,28,30,34,36,37,39,41,44,53,55,58,59,60,61,65],titl:[11,13,18,36,39,44,60,61,65],tld:[30,32],tmp:2,toctre:0,
 todai:[12,23],togeth:[0,57],token:[10,15,17,27,28,29,31,36,37,38,39,41,44],token_to_revok:55,tom:58,tomcat:29,too:0,tool:[10,12,13,14,35],top:[25,31,54,62],topic:[13,52,60,61,65],topolog:30,track:[7,8,41],trail:57,transfer:28,transform:0,transit:[36,65],transport:[30,32],treat:[17,29],trend:35,trial:28,truli:35,tsefia:36,ttl:29,ttl_in_millisecond:53,tupl:16,turn:54,tutori:26,tweet:[21,35,59],twitter:[21,35,59,62],two:[12,13,14,21,31,33,34,36,51,62,63,64],type:[1,3,5,6,7],typic:[11,12,28,34,65],udpat:0,uffff:[11,12],ugc:49,under:[27,30,52,55,56,62],underli:16,understand:34,unencod:[10,12,13,14],unexpect:44,unfamiliar:16,unfortun:0,unicod:[11,12],union:[11,12],uniqu:[1,12,17,34,41,44,54,60,61,62,65],univers:34,unix:[1,7,41,44,61],unless:[0,41,51,54,57,62],unlik:[12,16,17,34],unnecesari:56,unreleas:32,unsecur:56,unsent:44,until:33,untrust:56,untrustworthi:29,upcom:23,upon:28,upward:7,uri:[3,6,7,9,10,12,14,15,16,17,18,19,20,22,28],url:[10,12,13,14,15,17,18,22],usag:9,usegrid:[28,29],use
 r:[6,8,11,12,13,14,15,17,18,19,20,21,22,23,25,26,27,28,29],user_uuid:18,user_uuid_or_usernam:55,usergrid_appl:32,usergriddatacli:[52,55],usergridsdk:54,userid:44,usernam:[12,13,14,17,19,20,22,28,30,31,32,34,36,39,41,44,50,52,53,56,57,58,59,60,62,63,65],username_or_email:65,usual:30,utc:[34,44],util:[31,34,35],uuid:[1,3,5,6,7,11,12,14,15,16,17,18,19,20,22,23,28,34,36,37,39,41,44,53,54,58,59,60,61,65],uuid_for_selected_review:18,val:54,valid:[2,15,17,34,36,37,39,41,51,53,54,56,58,59,60,61,65],valu:[2,7,9,11],valuabl:35,value_1:[15,17],value_2:[15,17],vari:9,variabl:58,varieti:[17,28,38,65],variou:56,verb:[18,21,36,39,44,59],veri:[0,12,13,14,26,34,51,59],verifi:50,version:[30,32,62],versu:59,via:[0,30,34,36,39,57,58,60,61,64],video:[1,6,29,35],view:[9,12,18,22,30,32,57,59],virtual:21,visit:30,visitor:57,w3c:[36,65],wai:[7,12,13,14,16],wait:[12,13,33],walk:21,wall:59,want:[0,2,6,7,12,13],war:29,warn:[27,51,52,57],watch:30,web:[12,14,16,18,30,31,32,37,41,52,54,56,57,64],webapp:[30,31],we
 ek:9,welcom:[30,32],well:[23,28,30,35,55,56,59,62,63,64,65],went:30,were:[12,13,14,23,60,61],what:[18,23,26],whatev:27,whatsoev:50,when:[0,6,10,12,13,14,17,18,19,21,23,27,28,29,30,32,33,34,35,44,50,51,52],whenev:54,where:[0,3,11,12,13,14,18,21,23,26,27,28,32,34,41,54,56,59,65],whether:[12,41,44,51,64],which:[0,9,12,13,15,16,17,18,20,25,30,33,34,36,38,41,44,50,51,52,53,54,56,57,58,59,60,61,63,65],who:[18,21,35,42,44,50,52,56,59],whole:[12,17,44],whose:[12,13,14,22,28,65],why:30,wide:[57,65],width:[43,44,59],wildcard:[13,58],window:[26,49,54,62],wireless:[12,23],wish:[15,34,65],within:[7,12,13,17,23,30,34,39,53,57,59,62],without:[12,13,51,65],won:59,word:[12,13,15,16,17,18,21,59],work:[0,13,14,16,18,23,27,29,30,32,33,35,55,56],workflow:42,world:59,would:[5,9,10,12,13,18,22,23,30,36,51,53,54,56,57,58,59,60,61,63,65],wouldn:18,write:[12,16,18,50,62],written:[0,16,18,30,42],wrong:[21,30],wrote:18,www:[12,14,28,36,43,54,59,60,65],xfbml:54,xml:2,xxxx:12,xxxxxxxx:12,xxxxxxxxxxxx:12,yaml:0,y
 ear:59,yet:[12,13,60],yhixpqk1cq:37,you:[0,2,3,5,6,7,8,9,10,11,12,13,14,15,16,17],your:[0,2,5,6,7,8,9,10,11,12,13],your_app_id:54,your_domain:54,your_redirect_url:54,your_response_typ:54,your_state_valu:54,yourapp:10,yourappnam:54,yourdomain:28,yourorg:10,yourorgnam:54,ywmt4nqe8q9geelyjhixpsio4aaaato5fqfcg0ced2h9nwmdmrorknnreeqydof:36,ywq6aaabmqz_xuyyeerokkjnzn7yqxxlpgml69fvaa:52,yxa65gylqja8ayysay8ox3vg5arzp48:37,yxa6aaabmq0d4mep_ugbza0:52,yxa7ygil:37,yxb7nad7em0meej989xixprxekq:52,yxb7nautv9krhhmr8ycw0qbozh2pxef:52,yxu6aaabmq0hdy4:52,zip:54},titles:["Apache Usergrid Documentation","Assets","File storage configuration","Folders","<no title>","Retrieving assets","Uploading assets","Creating & incrementing counters","Counters & events","Retrieving counters","Advanced query usage","Query operators & data types","Query Language","Query parameters & clauses","Querying your data","Collections","The Usergrid Data Store","Entities","Data Store Best Practices","Connect
 ing entities","Disconnecting entities","Relationships","Retrieving connections","Geolocating your Entities","COMING SOON...","Creating a new application","Creating an Usergrid Account","Using a Sandbox Application","Using the API","Apache Usergrid Documentation","Usegrid 1: Deploying to Tomcat","Usegrid 1: Launcher Quick-start","Usergrid 2: Deploy to Tomcat","Async vs. sync calls","Usergrid Data model","Usergrid Features","Admin user$","Application","Organization & application management","Organization","COMING IN USERGRID 2","Users & Devices","How to Contribute Code & Docs","Presentations & Videos","Methods","iOS SDK","Java SDK","JavaScript/HTML5 SDK","COMING SOON...","SDKs & Tools","Security & token authentication","Authenticating API requests","Authenticating users & app clients","Changing token expiration (time-to-live)","Facebook sign in","Revoking tokens (logout)","Security best practices","Authentication levels","Using permissions","Activity","Work
 ing with group data","Groups","App Example - Messagee","Social Graph Connections","User management & social graph","Working with User Data"],titleterms:{"default":[34,53,56],"new":[25,27],"return":65,"super":30,access:[28,51,56],account:[26,62],acquir:56,action:44,activ:[35,36,39,59,64],activityfe:44,actor:44,add:[30,54],addpermiss:44,addrol:44,admin:[36,39,52,55,57],adminuserupd:44,advanc:10,all:[10,21,22],android:62,apach:[0,29,43],api:[0,10,28,31,51],app:[23,43,52,54,56,62],appdata:44,applic:[25,27,34,35,37,38,39,52],asset:[1,3,5,6,35],assign:58,async:33,asynchron:33,attach:10,authent:[28,35,50,51,52,57],backend:43,base:28,basic:[12,14],batch:15,best:[18,56],between:[0,21],build:[0,30,31,32,43],call:[10,33],cancelmsg:44,cassandra:[30,43],chang:[0,53,65],claus:13,client:[39,51,52,56,62],code:42,collect:[15,28,34,44,61],come:[24,40,48],complet:36,complex:58,comput:18,configur:[2,30,57],connect:[19,21,22,63,64],consol:30,construct:28,contain:13,content:[0,12],contribut:[42,43],c
 ounter:[7,8,9],creat:[7,15,17,21,25,26,27,36,37,39,53,54,59,60,62,63,65],createact:44,createadminus:44,createapp:44,createent:44,createev:44,creategroup:44,createnotif:44,createorg:44,createus:44,credenti:[37,39,44],cursor:13,custom:[17,30],data:[5,11,12,14,16,17,18,23,34,35,60,65],databas:30,deal:0,decrement:7,delet:[15,17,21,60,65],denorm:18,deploi:[30,32],deploy:32,descript:60,devic:[41,44],dialog:54,differ:0,disconnect:20,displai:65,doc:[0,42],document:[0,29,42],download2:31,download:[30,31],edit:56,enrich:23,entiti:[5,15,17,19,20,21,22,23,28,34,35,44],error:44,event:[8,44],exampl:[5,6,7,9,15,17,30,32,36,37,39,52,53,54,55,58,59,60,62,65],expir:53,facebook:[41,54],featur:35,feed:[36,39,59,64],file:[0,2,30,32,35],flexibl:35,folder:3,follow:[59,63],form:65,format:[12,28],from:[15,39,60],gener:[37,39,61],geoloc:[23,35],geoqueri:12,get:[18,21,30,31,36,37,39,65],graph:[63,64],group:[35,44,59,60,61,64],handl:65,hierarch:7,how:[0,42,43],html5:[47,62],http:[28,31,56],imagemodel:44,increm
 ent:7,inform:21,initi:36,instal:30,intern:43,interv:9,invok:54,issu:28,itself:32,java:[32,46],javascript:[47,54,62],languag:12,larg:12,launcher:31,let:65,level:[52,57],limit:13,link:3,list:3,live:53,local:[2,32],locat:[13,23],login:[30,35,52,54],logout:55,manag:[12,35,38,64],markdown:0,message:62,metadata:44,method:[28,44],mobil:[43,56],model:[18,34,44],multipl:[12,14,17],never:56,next:26,note:0,notif:[35,44],notifi:44,oauth:[28,54],object:44,open:43,oper:[11,12],order:13,organ:[34,38,39,44,52],other:[0,21,63],out:18,overview:43,paramet:[13,60],parti:35,password:[36,65],path:58,permiss:[35,44,56,58],portal:32,post:59,practic:[18,56],pre:18,prerequisit:0,present:43,product:56,properti:[12,14,17,30,32,34,41,61],publish:0,push:35,put:18,queri:[10,11,12,13,14,18,23,28,35],quick:31,reactiv:[36,39],receipt:44,refer:0,registr:35,relat:18,relationship:[21,35,41],relationshop:41,remov:[39,58,60],request:[5,6,7,9,14,15,17,19,20,22,28,36,37,39,51,52,53,55,58,59,60,65],requir:[30,31,32],reset:[
 7,36,65],resetpw:44,resetpwmsg:44,respons:[6,7,9,12,14,15,17,28,36,37,39,52,53,58,59,60,65],rest:[0,65],result:[12,18],retriev:[3,5,9,12,14,15,17,18,22,39,59,60,65],review:[18,56],revok:55,role:[35,44,56],rst:0,run:[30,31,32],sandbox:[27,56],save:23,schedulenotif:44,sdk:[28,32,45,46,47,49,52,54,62],secret:51,secur:[25,27,50,56],set:[12,15,36,41,44,61],setexpir:44,setup:[30,54],sign:[41,54],social:[35,63,64],soon:[24,48],sort:12,sourc:43,specif:21,sphinx:0,stack:32,start:[30,31],step:[26,54,62,65],storag:[2,35],store:[16,18],stream:35,sub:17,support:[12,28],sync:33,synchron:33,syntax:[5,6,7,9,12,14,15,17,19,20,22,52,53,55,58,60,65],tabl:0,text:12,third:35,time:[9,53],token:[50,51,53,55,56],tomcat:[30,32],tool:49,treat:56,ttl:53,type:[11,12,21,22],untrustworthi:56,updat:[0,6,15,17,36,65],upload:6,uri:[36,37,39,59,60,65],url:[28,39],usag:[10,14],usegrid:[30,31],user:[30,35,36,39,41,44,52,55,57,59,60,62,64,65],usergrid:[0,16,26,29,30,32,34,35,40,43,62,65],valu:[12,14],video:43,wai:[18,5
 6],want:18,war:30,websit:[0,42],what:27,when:53,work:[60,65],you:18,your:[14,18,23,56]}})
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/security-and-auth/app-security.html
----------------------------------------------------------------------
diff --git a/content/docs/security-and-auth/app-security.html b/content/docs/security-and-auth/app-security.html
new file mode 100644
index 0000000..247cf84
--- /dev/null
+++ b/content/docs/security-and-auth/app-security.html
@@ -0,0 +1,320 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>Security &amp; token authentication &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+        <link rel="next" title="Using permissions" href="using-permissions.html"/>
+        <link rel="prev" title="Disconnecting entities" href="../entity-connections/disconnecting-entities.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul class="current">
+<li class="toctree-l1 current"><a class="current reference internal" href="">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>Security &amp; token authentication</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/security-and-auth/app-security.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="security-token-authentication">
+<h1>Security &amp; token authentication<a class="headerlink" href="#security-token-authentication" title="Permalink to this headline">¶</a></h1>
+<p>Any app you put into production should feature security that protects
+your app, your users, and your app&#8217;s data. Implementing security means
+taking steps in your mobile app&#8217;s code and in your API Services BaaS
+application.</p>
+<p><strong>Important</strong>: When you register for the API Services BaaS, you get a
+sandbox application that you can use to try things out. This application
+is not for use in production. By default, the sandbox application is not
+protected by any security measures whatsoever. Use the sandbox only for
+experimentation, and only with data that isn&#8217;t in any way sensitive.</p>
+<p>When securing your app, follow these high-level steps:</p>
+<ol class="arabic simple">
+<li>Define the rules that will govern access by your app&#8217;s users to your
+app&#8217;s data and features. You do this with the admin portal by
+creating permission rules, then associating those rules with your
+users. For more information, see <a class="reference external" href="managing-access-defining-permission-rules.html">Using
+Permissions</a>.</li>
+<li>Write code through which your app&#8217;s users can verify who they are to
+your application. You do this by writing code that uses their
+username and password as credentials to initially authenticate with
+your application, then uses a token thereafter. (This authentication
+style supports the OAuth 2.0 model.) For more information, see
+<a class="reference external" href="autheticating-users-and-application-clients.html">Authenticating users &amp; app
+clients</a>.</li>
+<li>Be sure to use coding best practices that help ensure that your app
+is protected from malicious attacks. For more information, see
+<a class="reference external" href="security-best-practices.html">Security best practices</a>.</li>
+</ol>
+<p>The following illustration describes these high-level areas.</p>
+<img alt="../_images/securitymodel0.png" src="../_images/securitymodel0.png" />
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+      
+        <a href="using-permissions.html" class="btn btn-neutral float-right" title="Using permissions" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+      
+      
+        <a href="../entity-connections/disconnecting-entities.html" class="btn btn-neutral" title="Disconnecting entities" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+      
+    </div>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/security-and-auth/authenticating-api-requests.html
----------------------------------------------------------------------
diff --git a/content/docs/security-and-auth/authenticating-api-requests.html b/content/docs/security-and-auth/authenticating-api-requests.html
new file mode 100644
index 0000000..e5afa55
--- /dev/null
+++ b/content/docs/security-and-auth/authenticating-api-requests.html
@@ -0,0 +1,367 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>Authenticating API requests &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+        <link rel="next" title="Revoking tokens (logout)" href="revoking-tokens-logout.html"/>
+        <link rel="prev" title="Changing token expiration (time-to-live)" href="changing-token-time-live-ttl.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">Authenticating API requests</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#authenticating-with-access-tokens">Authenticating with access tokens</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#authenticating-with-client-id-and-client-secret">Authenticating with client ID and client secret</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>Authenticating API requests</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/security-and-auth/authenticating-api-requests.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="authenticating-api-requests">
+<h1>Authenticating API requests<a class="headerlink" href="#authenticating-api-requests" title="Permalink to this headline">¶</a></h1>
+<p>With the exception of the &#8216;sandbox&#8217; application that is created with
+every Usergrid organization, all applications are secured by default.
+This means that to access your data store, a valid access token must be
+sent with all API requests to authenticate that the requester is
+authorized to make API calls to the resources they are attempting the
+access.</p>
+<p>This article describes how to use access tokens to access the Usergrid
+API, and how to manage access tokens, including revoking and changing
+token time to live.</p>
+<p>For information on generating access tokens/authenticating users and
+clients, see Authenticating users and application clients.</p>
+<div class="section" id="authenticating-with-access-tokens">
+<h2>Authenticating with access tokens<a class="headerlink" href="#authenticating-with-access-tokens" title="Permalink to this headline">¶</a></h2>
+<p>When you obtain an access token, you must provide it with every
+subsequent API call that you make. There are two ways to provide your
+access token.</p>
+<p>You can add the token to the API query string:</p>
+<div class="highlight-python"><div class="highlight"><pre>https://&lt;usergrid-host&gt;/{org-name}/{app-name}/users?access_token={access_token}
+</pre></div>
+</div>
+<p>You can include the token in an HTTP authorization header:</p>
+<div class="highlight-python"><div class="highlight"><pre>Authorization: Bearer {access_token}
+</pre></div>
+</div>
+<div class="admonition note"> <p class="first admonition-title"><p>Note</p>
+  </p> <p class="last">
+
+
+Note: The Usergrid documentation assumes you are providing a valid<p>access token with every API call whether or not it is shown explicitly
+in the examples. Unless the documentation specifically says that you can
+access an API endpoint without an access token, you should assume that
+you must provide it. One application that does not require an access
+token is the sandbox application. The Guest role has been given full
+permissions (/** for GET, POST, PUT, and DELETE) for this application.
+This eliminates the need for a token when making application level calls
+to the sandbox app. For further information on specifying permissions,
+see Managing access by defining permission rules.</p>
+</p></div></div>
+<div class="section" id="authenticating-with-client-id-and-client-secret">
+<h2>Authenticating with client ID and client secret<a class="headerlink" href="#authenticating-with-client-id-and-client-secret" title="Permalink to this headline">¶</a></h2>
+<p>Another option for authenticating your API requests is using either your
+organization client ID and client secret, or your application client ID
+and client secret, which will authenticate your request as an
+organization or application admin, respectively. Organization
+credentials can be found in the &#8216;Org Overview&#8217; section of the admin
+portal, and application credentials can be found in the &#8216;Getting
+Started&#8217; section of the admin portal.</p>
+<div class="admonition warning"> <p class="first admonition-title"><p>WARNING</p>
+  </p> <p class="last">
+
+
+Warning: For server-side use only You should never authenticate this<p>way from a client-side app such as a mobile app. A hacker could analyze
+your app and extract the credentials for malicious use even if those
+credentials are compiled and in binary format. See Security best
+practices for additional considerations in keeping access to your app
+and its data secure.</p>
+</p></div><p>This can be a convenient way to authenticate API requests, since there
+is no need to generate and manage an access token, but please note that
+you should be very cautious when implementing this type of
+authentication. Organization-level authentication grants full permission
+to perform any supported call against your organization and every
+application in it, and application-level authentication grants full
+permission to perform any supported call against all of the resources in
+an application. Should your client id and client secret be compromised,
+a malicious user would gain broad access to your organization or
+application.</p>
+<p>To authenticate using client id and secret, append the following
+parameters to your request URL:</p>
+<div class="highlight-python"><div class="highlight"><pre>client_id=&lt;your-client-id&gt;&amp;client_secret=&lt;your-client-secret&gt;
+</pre></div>
+</div>
+</div>
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+      
+        <a href="revoking-tokens-logout.html" class="btn btn-neutral float-right" title="Revoking tokens (logout)" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+      
+      
+        <a href="changing-token-time-live-ttl.html" class="btn btn-neutral" title="Changing token expiration (time-to-live)" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+      
+    </div>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

[14/60] [abbrv] incubator-usergrid git commit: cherry picking docs from master

[sn...@apache.org]

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/orgs-and-apps/application.html
----------------------------------------------------------------------
diff --git a/content/docs/orgs-and-apps/application.html b/content/docs/orgs-and-apps/application.html
new file mode 100644
index 0000000..7213562
--- /dev/null
+++ b/content/docs/orgs-and-apps/application.html
@@ -0,0 +1,495 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>Application &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+        <link rel="next" title="Methods" href="../rest-endpoints/api-docs.html"/>
+        <link rel="prev" title="Organization" href="organization.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="organization.html">Organization</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">Application</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#creating-an-application">Creating an application</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#request-uri">Request URI</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#example-request">Example - Request</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#example-response">Example - Response</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#generating-application-credentials">Generating application credentials</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#id1">Request URI</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id2">Example - Request</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id3">Example - Response</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#getting-application-credentials">Getting application credentials</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#id4">Request URI</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id5">Example - Request</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id6">Example - Response</a></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>Application</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/orgs-and-apps/application.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="application">
+<h1>Application<a class="headerlink" href="#application" title="Permalink to this headline">¶</a></h1>
+<p>You can create a new application in an organization through the Admin
+portal. The Admin portal creates the new application by issuing a post
+against the management endpoint (see the &#8220;Creating an organization
+application&#8221; section in Organization for details). If you need to create
+an application programmatically in your app, you can also use the API to
+do this. You can access application entities using your app name or
+UUID, prefixed with the organization name or UUID:</p>
+<div class="highlight-python"><div class="highlight"><pre>https://api.usergrid.com/{org_name|uuid}/{app_name|uuid}
+</pre></div>
+</div>
+<p>Most mobile apps never access the application entity directly. For
+example you might have a server-side web app that accesses the
+application entity for configuration purposes. If you want to access
+your application entity programmatically, you can use the API.</p>
+<div class="section" id="creating-an-application">
+<h2>Creating an application<a class="headerlink" href="#creating-an-application" title="Permalink to this headline">¶</a></h2>
+<p>To create an application you POST a JSON object containing (at a
+minimum) the name of the new application. You will also need to pass
+authentication credentials.</p>
+<div class="section" id="request-uri">
+<h3>Request URI<a class="headerlink" href="#request-uri" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>POST /management/organizations|orgs/{org_name}|{org_uuid}/apps {request body}
+</pre></div>
+</div>
+<p>Parameters</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="13%" />
+<col width="12%" />
+<col width="75%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Sent in</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>grant_type</td>
+<td>Query string</td>
+<td>Only the value &#8216;client_credentials&#8217; is supported.</td>
+</tr>
+<tr class="row-odd"><td>client_id</td>
+<td>Query string</td>
+<td>The org-level client id for your org, found in the &#8216;Org Administration&#8217; menu of Usergrid portal.</td>
+</tr>
+<tr class="row-even"><td>client_secret</td>
+<td>Query string</td>
+<td>The org-level client secret for your org, found in the &#8216;Org Administration&#8217; menu Usergrid portal.</td>
+</tr>
+<tr class="row-odd"><td>name</td>
+<td>Request Body</td>
+<td>The name of the application.</td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="section" id="example-request">
+<h3>Example - Request<a class="headerlink" href="#example-request" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X -i POST &quot;https://api.usergrid.com/management/orgs/testorg/apps?grant_type=client_credentials&amp;client_id=b3U68vghI6FmEeKn9wLoGtzz0A&amp;client_secret=b3U6ZuZ5_U8Y-bOaViJt0OyRkJFES-A&quot; -d &#39;{&quot;name&quot;:&quot;testapp1&quot;}&#39;
+</pre></div>
+</div>
+</div>
+<div class="section" id="example-response">
+<h3>Example - Response<a class="headerlink" href="#example-response" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+  <span class="s">&quot;action&quot;</span><span class="p">:</span> <span class="s">&quot;new application for organization&quot;</span><span class="p">,</span>
+  <span class="s">&quot;timestamp&quot;</span><span class="p">:</span> <span class="mi">1338914698135</span><span class="p">,</span>
+  <span class="s">&quot;duration&quot;</span><span class="p">:</span> <span class="mi">701</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+</div>
+<div class="section" id="generating-application-credentials">
+<h2>Generating application credentials<a class="headerlink" href="#generating-application-credentials" title="Permalink to this headline">¶</a></h2>
+<p>Use the POST method to generate the client ID and client secret
+credentials for an application in an organization.</p>
+<div class="section" id="id1">
+<h3>Request URI<a class="headerlink" href="#id1" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">POST</span> <span class="o">/</span><span class="n">organizations</span><span class="o">|</span><span class="n">orgs</span><span class="o">/</span><span class="p">{</span><span class="n">org_name</span><span class="p">}</span><span class="o">|</span><span class="p">{</span><span class="n">uuid</span><span class="p">}</span><span class="o">/</span><span class="n">applications</span><span class="o">|</span><span class="n">apps</span><span class="o">/</span><span class="p">{</span><span class="n">app_name</span><span class="p">}</span><span class="o">|</span><span class="p">{</span><span class="n">uuid</span><span class="p">}</span><span class="o">/</span><span class="n">credentials</span>
+</pre></div>
+</div>
+<p>Parameters</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="41%" />
+<col width="59%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>string org_name|arg uuid</td>
+<td>Organization name or organization UUID.</td>
+</tr>
+<tr class="row-odd"><td>string app_name|arg uuid</td>
+<td>Application name or application UUID.</td>
+</tr>
+</tbody>
+</table>
+<p>Note: You also need to provide a valid access token with the API call.
+See <a class="reference external" href="../security_and_auth/authenticating-users-and-application-clients.html">Authenticating users and application
+clients</a>
+for details.</p>
+</div>
+<div class="section" id="id2">
+<h3>Example - Request<a class="headerlink" href="#id2" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X POST &quot;https://api.usergrid.com/management/orgs/testorg/apps/testapp1/credentials&quot;
+</pre></div>
+</div>
+</div>
+<div class="section" id="id3">
+<h3>Example - Response<a class="headerlink" href="#id3" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+  <span class="s">&quot;action&quot;</span><span class="p">:</span> <span class="s">&quot;generate application client credentials&quot;</span><span class="p">,</span>
+  <span class="s">&quot;timestamp&quot;</span><span class="p">:</span> <span class="mi">1349815979529</span><span class="p">,</span>
+  <span class="s">&quot;duration&quot;</span><span class="p">:</span> <span class="mi">535</span><span class="p">,</span>
+  <span class="s">&quot;credentials&quot;</span><span class="p">:</span>  <span class="p">{</span>
+    <span class="s">&quot;client_id&quot;</span><span class="p">:</span> <span class="s">&quot;YXA7ygil-f3TEeG-yhIxPQK1cQ&quot;</span><span class="p">,</span>
+    <span class="s">&quot;client_secret&quot;</span><span class="p">:</span> <span class="s">&quot;YXA65gYlqja8aYYSAy8Ox3Vg5aRZp48&quot;</span>
+  <span class="p">}</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+</div>
+<div class="section" id="getting-application-credentials">
+<h2>Getting application credentials<a class="headerlink" href="#getting-application-credentials" title="Permalink to this headline">¶</a></h2>
+<p>Use the GET method to retrieve the client ID and client secret
+credentials for an application in an organization.</p>
+<div class="section" id="id4">
+<h3>Request URI<a class="headerlink" href="#id4" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">GET</span> <span class="o">/</span><span class="n">organizations</span><span class="o">|</span><span class="n">orgs</span><span class="o">/</span><span class="p">{</span><span class="n">org_name</span><span class="p">}</span><span class="o">|</span><span class="p">{</span><span class="n">uuid</span><span class="p">}</span><span class="o">/</span><span class="n">applications</span><span class="o">|</span><span class="n">apps</span><span class="o">/</span><span class="p">{</span><span class="n">app_name</span><span class="p">}</span><span class="o">|</span><span class="p">{</span><span class="n">uuid</span><span class="p">}</span><span class="o">/</span><span class="n">credentials</span>
+</pre></div>
+</div>
+<p>Parameters</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="41%" />
+<col width="59%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>string org_name|arg uuid</td>
+<td>Organization name or organization UUID.</td>
+</tr>
+<tr class="row-odd"><td>string app_name|arg uuid</td>
+<td>Application name or application UUID.</td>
+</tr>
+</tbody>
+</table>
+<p>Note: You also need to provide a valid access token with the API call.
+See <a class="reference external" href="../security_and_auth/authenticating-users-and-application-clients.html">Authenticating users and application
+clients</a>
+for details.</p>
+</div>
+<div class="section" id="id5">
+<h3>Example - Request<a class="headerlink" href="#id5" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X GET &quot;https://api.usergrid.com/management/orgs/testorg/apps/testapp1/credentials&quot;
+</pre></div>
+</div>
+</div>
+<div class="section" id="id6">
+<h3>Example - Response<a class="headerlink" href="#id6" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+  <span class="s">&quot;action&quot;</span><span class="p">:</span> <span class="s">&quot;get application client credentials&quot;</span><span class="p">,</span>
+  <span class="s">&quot;timestamp&quot;</span><span class="p">:</span> <span class="mi">1349816819545</span><span class="p">,</span>
+  <span class="s">&quot;duration&quot;</span><span class="p">:</span> <span class="mi">7</span><span class="p">,</span>
+  <span class="s">&quot;credentials&quot;</span><span class="p">:</span>  <span class="p">{</span>
+    <span class="s">&quot;client_id&quot;</span><span class="p">:</span> <span class="s">&quot;YXA7ygil-f3TEeG-yhIxPQK1cQ&quot;</span><span class="p">,</span>
+    <span class="s">&quot;client_secret&quot;</span><span class="p">:</span> <span class="s">&quot;YXA65gYlqja8aYYSAy8Ox3Vg5aRZp48&quot;</span>
+  <span class="p">}</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+</div>
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+      
+        <a href="../rest-endpoints/api-docs.html" class="btn btn-neutral float-right" title="Methods" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+      
+      
+        <a href="organization.html" class="btn btn-neutral" title="Organization" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+      
+    </div>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/orgs-and-apps/managing.html
----------------------------------------------------------------------
diff --git a/content/docs/orgs-and-apps/managing.html b/content/docs/orgs-and-apps/managing.html
new file mode 100644
index 0000000..817a6f2
--- /dev/null
+++ b/content/docs/orgs-and-apps/managing.html
@@ -0,0 +1,340 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>Organization &amp; application management &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+        <link rel="next" title="Organization" href="organization.html"/>
+        <link rel="prev" title="Retrieving counters" href="../counters-and-events/retrieving-counters.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul class="current">
+<li class="toctree-l1 current"><a class="current reference internal" href="">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>Organization &amp; application management</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/orgs-and-apps/managing.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="organization-application-management">
+<h1>Organization &amp; application management<a class="headerlink" href="#organization-application-management" title="Permalink to this headline">¶</a></h1>
+<p>Your application can use the App Services API to request a variety of
+management operations on App Services resources. For example, your
+application can request an access token to use in operations on entities
+and collections. Or it can create an organization to contain the
+applications, entities, and collections for a company, team, or project.</p>
+<p>Your application makes requests through the API using HTTP methods such
+as GET, POST, PUT, and DELETE, and specifies the pertinent resource URL.
+For management operations, the URL begins with <code class="docutils literal"><span class="pre">/management/</span></code>. See
+<a class="reference external" href="../getting-started/using-the-api.html">Using the API</a> for general
+usage information, such as how to construct an API request.</p>
+<p>The following table lists and describes resources accessible through the
+App Services API on which your application can perform management
+operations. Click on a resource for further details about the resource
+and its methods.</p>
+<table class="usergrid-table">
+<tr>
+  <th><p>Resource</p>
+</th>
+  <th><p>Description</p>
+</th>
+</tr>
+<tr>
+  <td><p><a class="reference external" href="../security-and-auth/authenticating-users-and-application-clients.html">Access
+Token</a></p>
+</td>
+  <td><p>Carries the credentials and authorization information needed to access
+other resources through the Usergrid API.</p>
+</td>
+</tr>
+<tr>
+  <td><p><a class="reference external" href="../security-and-auth/authenticating-api-requests.html">Client
+Authorization</a></p>
+</td>
+  <td><p>Authorizes the client.</p>
+</td>
+</tr>
+<tr>
+  <td><p><a class="reference external" href="organization.html">Organization</a></p>
+</td>
+  <td><p>The highest level structure in the Usergrid data hierarchy.</p>
+</td>
+</tr>
+<tr>
+  <td><p><a class="reference external" href="adminuser.html">Admin User</a></p>
+</td>
+  <td><p>A user that has full access to perform any operation on all organization
+accounts of which the user is a member.</p>
+</td>
+</tr>
+</table></div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+      
+        <a href="organization.html" class="btn btn-neutral float-right" title="Organization" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+      
+      
+        <a href="../counters-and-events/retrieving-counters.html" class="btn btn-neutral" title="Retrieving counters" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+      
+    </div>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

[17/60] [abbrv] incubator-usergrid git commit: cherry picking docs from master

[sn...@apache.org]

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/index.html
----------------------------------------------------------------------
diff --git a/content/docs/index.html b/content/docs/index.html
new file mode 100644
index 0000000..81812d4
--- /dev/null
+++ b/content/docs/index.html
@@ -0,0 +1,732 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>Apache Usergrid Documentation &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="#"/>
+        <link rel="next" title="Usergrid Features" href="introduction/usergrid-features.html"/> 
+
+  
+  <script src="_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="#" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="data-queries/query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="data-queries/operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="security-and-auth/app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="security-and-auth/authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="user-management/user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="asset-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="asset-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="#">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="#">Docs</a> &raquo;</li>
+      
+    <li>Apache Usergrid Documentation</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="_sources/index.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="apache-usergrid-documentation">
+<h1>Apache Usergrid Documentation<a class="headerlink" href="#apache-usergrid-documentation" title="Permalink to this headline">¶</a></h1>
+<div class="toctree-wrapper compound" id="introduction">
+<p class="caption"><span class="caption-text">Introduction</span><a class="headerlink" href="#introduction" title="Permalink to this toctree">¶</a></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="introduction/usergrid-features.html">Usergrid Features</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="introduction/usergrid-features.html#data-storage-management">Data storage &amp; management</a></li>
+<li class="toctree-l2"><a class="reference internal" href="introduction/usergrid-features.html#flexible-data-querying">Flexible data querying</a></li>
+<li class="toctree-l2"><a class="reference internal" href="introduction/usergrid-features.html#social">Social</a></li>
+<li class="toctree-l2"><a class="reference internal" href="introduction/usergrid-features.html#user-management">User management</a></li>
+<li class="toctree-l2"><a class="reference internal" href="introduction/usergrid-features.html#geolocation">Geolocation</a></li>
+<li class="toctree-l2"><a class="reference internal" href="introduction/usergrid-features.html#push-notifications">Push notifications</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="introduction/data-model.html">Usergrid Data model</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="introduction/data-model.html#organizations">Organizations</a></li>
+<li class="toctree-l2"><a class="reference internal" href="introduction/data-model.html#applications">Applications</a></li>
+<li class="toctree-l2"><a class="reference internal" href="introduction/data-model.html#collections">Collections</a></li>
+<li class="toctree-l2"><a class="reference internal" href="introduction/data-model.html#entities">Entities</a></li>
+<li class="toctree-l2"><a class="reference internal" href="introduction/data-model.html#default-entities">Default entities</a></li>
+<li class="toctree-l2"><a class="reference internal" href="introduction/data-model.html#properties">Properties</a></li>
+<li class="toctree-l2"><a class="reference internal" href="introduction/data-model.html#default-properties">Default properties</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="introduction/async-vs-sync.html">Async vs. sync calls</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="introduction/async-vs-sync.html#synchronous">Synchronous</a></li>
+<li class="toctree-l2"><a class="reference internal" href="introduction/async-vs-sync.html#asynchronous">Asynchronous</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="toctree-wrapper compound" id="id1">
+<span id="getting-started"></span><p class="caption"><span class="caption-text">Getting Started</span><a class="headerlink" href="#id1" title="Permalink to this toctree">¶</a></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="getting-started/creating-a-new-application.html">Creating a new application</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="getting-started/creating-a-new-application.html#creating-an-application">Creating an application</a></li>
+<li class="toctree-l2"><a class="reference internal" href="getting-started/creating-a-new-application.html#securing-an-application">Securing an application</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="getting-started/creating-account.html">Creating an Usergrid Account</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="getting-started/creating-account.html#next-steps">Next steps</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="getting-started/using-a-sandbox-app.html#what-is-the-sandbox-application">What is the sandbox application?</a></li>
+<li class="toctree-l2"><a class="reference internal" href="getting-started/using-a-sandbox-app.html#is-the-sandbox-secure">Is the sandbox secure?</a></li>
+<li class="toctree-l2"><a class="reference internal" href="getting-started/using-a-sandbox-app.html#creating-a-new-sandbox-application">Creating a New Sandbox Application</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="getting-started/using-the-api.html">Using the API</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="getting-started/using-the-api.html#supported-http-methods">Supported HTTP methods</a></li>
+<li class="toctree-l2"><a class="reference internal" href="getting-started/using-the-api.html#base-url">Base URL</a></li>
+<li class="toctree-l2"><a class="reference internal" href="getting-started/using-the-api.html#request-construction">Request construction</a></li>
+<li class="toctree-l2"><a class="reference internal" href="getting-started/using-the-api.html#accessing-collections">Accessing collections</a></li>
+<li class="toctree-l2"><a class="reference internal" href="getting-started/using-the-api.html#accessing-entities">Accessing entities</a></li>
+<li class="toctree-l2"><a class="reference internal" href="getting-started/using-the-api.html#issuing-queries">Issuing queries</a></li>
+<li class="toctree-l2"><a class="reference internal" href="getting-started/using-the-api.html#authentication-oauth">Authentication (OAuth)</a></li>
+<li class="toctree-l2"><a class="reference internal" href="getting-started/using-the-api.html#response-format">Response format</a></li>
+<li class="toctree-l2"><a class="reference internal" href="getting-started/using-the-api.html#sdks">SDKs</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="toctree-wrapper compound" id="id2">
+<span id="data-storage"></span><p class="caption"><span class="caption-text">Data Storage</span><a class="headerlink" href="#id2" title="Permalink to this toctree">¶</a></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="data-storage/optimizing-access.html">Data Store Best Practices</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="data-storage/optimizing-access.html#put-your-data-in-as-you-ll-want-to-get-it-out">Put your data in as you&#8217;ll want to get it out</a></li>
+<li class="toctree-l2"><a class="reference internal" href="data-storage/optimizing-access.html#best-practice-denormalize-for-pre-computed-query-results">Best practice: Denormalize for pre-computed query results</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="data-storage/collections.html">Collections</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="data-storage/collections.html#creating-collections">Creating Collections</a></li>
+<li class="toctree-l2"><a class="reference internal" href="data-storage/collections.html#retrieving-collections">Retrieving Collections</a></li>
+<li class="toctree-l2"><a class="reference internal" href="data-storage/collections.html#updating-collections">Updating Collections</a></li>
+<li class="toctree-l2"><a class="reference internal" href="data-storage/collections.html#deleting-collections">Deleting Collections</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="data-storage/entities.html">Entities</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="data-storage/entities.html#creating-custom-data-entities">Creating Custom Data Entities</a></li>
+<li class="toctree-l2"><a class="reference internal" href="data-storage/entities.html#creating-multiple-custom-entities">Creating multiple custom entities</a></li>
+<li class="toctree-l2"><a class="reference internal" href="data-storage/entities.html#retrieving-data-entities">Retrieving Data Entities</a></li>
+<li class="toctree-l2"><a class="reference internal" href="data-storage/entities.html#updating-data-entities">Updating Data Entities</a></li>
+<li class="toctree-l2"><a class="reference internal" href="data-storage/entities.html#deleting-data-entities">Deleting Data Entities</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="toctree-wrapper compound" id="id3">
+<span id="data-queries"></span><p class="caption"><span class="caption-text">Data Queries</span><a class="headerlink" href="#id3" title="Permalink to this toctree">¶</a></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="data-queries/querying-your-data.html">Querying your data</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="data-queries/querying-your-data.html#basic-query-usage">Basic query usage</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="data-queries/query-parameters.html">Query parameters &amp; clauses</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="data-queries/query-parameters.html#contains">Contains</a></li>
+<li class="toctree-l2"><a class="reference internal" href="data-queries/query-parameters.html#location">Location</a></li>
+<li class="toctree-l2"><a class="reference internal" href="data-queries/query-parameters.html#order-by">Order by</a></li>
+<li class="toctree-l2"><a class="reference internal" href="data-queries/query-parameters.html#limit">Limit</a></li>
+<li class="toctree-l2"><a class="reference internal" href="data-queries/query-parameters.html#cursor">Cursor</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="data-queries/operators-and-types.html">Query operators &amp; data types</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="data-queries/operators-and-types.html#operators">Operators</a></li>
+<li class="toctree-l2"><a class="reference internal" href="data-queries/operators-and-types.html#data-types">Data types</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="data-queries/advanced-query-usage.html">Advanced query usage</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="data-queries/advanced-query-usage.html#attaching-a-query-to-all-api-calls">Attaching a query to all API calls</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="toctree-wrapper compound" id="id4">
+<span id="entity-connections"></span><p class="caption"><span class="caption-text">Entity Connections</span><a class="headerlink" href="#id4" title="Permalink to this toctree">¶</a></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="entity-connections/connecting-entities.html">Connecting entities</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="entity-connections/connecting-entities.html#request-syntax">Request syntax</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="entity-connections/retrieving-entities.html">Retrieving connections</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="entity-connections/retrieving-entities.html#request-syntax">Request syntax</a></li>
+<li class="toctree-l2"><a class="reference internal" href="entity-connections/retrieving-entities.html#retrieve-all-connected-entities">Retrieve all connected entities</a></li>
+<li class="toctree-l2"><a class="reference internal" href="entity-connections/retrieving-entities.html#retrieve-all-connecting-entities-by-type">Retrieve all connecting entities by type</a></li>
+<li class="toctree-l2"><a class="reference internal" href="entity-connections/retrieving-entities.html#retrieve-all-connecting-entities">Retrieve all connecting entities</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="entity-connections/disconnecting-entities.html">Disconnecting entities</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="entity-connections/disconnecting-entities.html#request-syntax">Request syntax</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="toctree-wrapper compound" id="security-authentication">
+<span id="security-and-authentication"></span><p class="caption"><span class="caption-text">Security &amp; Authentication</span><a class="headerlink" href="#security-authentication" title="Permalink to this toctree">¶</a></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="security-and-auth/app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="security-and-auth/using-permissions.html">Using permissions</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="security-and-auth/using-permissions.html#permissions-syntax">Permissions syntax</a></li>
+<li class="toctree-l2"><a class="reference internal" href="security-and-auth/using-permissions.html#complex-paths">Complex paths</a></li>
+<li class="toctree-l2"><a class="reference internal" href="security-and-auth/using-permissions.html#assigning-permissions">Assigning permissions</a></li>
+<li class="toctree-l2"><a class="reference internal" href="security-and-auth/using-permissions.html#removing-permissions">Removing permissions</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="security-and-auth/authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="security-and-auth/authenticating-users-and-application-clients.html#authentication-levels">Authentication levels</a></li>
+<li class="toctree-l2"><a class="reference internal" href="security-and-auth/authenticating-users-and-application-clients.html#application-user-authentication-user-login">Application user authentication (user login)</a></li>
+<li class="toctree-l2"><a class="reference internal" href="security-and-auth/authenticating-users-and-application-clients.html#application-client-authentication">Application client authentication</a></li>
+<li class="toctree-l2"><a class="reference internal" href="security-and-auth/authenticating-users-and-application-clients.html#admin-user-authentication">Admin user authentication</a></li>
+<li class="toctree-l2"><a class="reference internal" href="security-and-auth/authenticating-users-and-application-clients.html#organization-client-authentication">Organization client authentication</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="security-and-auth/user-authentication-types.html">Authentication levels</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="security-and-auth/user-authentication-types.html#configuring-authentication-levels">Configuring authentication levels</a></li>
+<li class="toctree-l2"><a class="reference internal" href="security-and-auth/user-authentication-types.html#user-authentication-level">User authentication level</a></li>
+<li class="toctree-l2"><a class="reference internal" href="security-and-auth/user-authentication-types.html#admin-authentication-levels">Admin authentication levels</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="security-and-auth/changing-token-time-live-ttl.html#default-ttl">Default ttl</a></li>
+<li class="toctree-l2"><a class="reference internal" href="security-and-auth/changing-token-time-live-ttl.html#changing-the-default-ttl">Changing the default ttl</a></li>
+<li class="toctree-l2"><a class="reference internal" href="security-and-auth/changing-token-time-live-ttl.html#changing-ttl-when-a-token-is-created">Changing ttl when a token is created</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="security-and-auth/authenticating-api-requests.html">Authenticating API requests</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="security-and-auth/authenticating-api-requests.html#authenticating-with-access-tokens">Authenticating with access tokens</a></li>
+<li class="toctree-l2"><a class="reference internal" href="security-and-auth/authenticating-api-requests.html#authenticating-with-client-id-and-client-secret">Authenticating with client ID and client secret</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="security-and-auth/revoking-tokens-logout.html#revoking-tokens-user-logout">Revoking tokens (user logout)</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="security-and-auth/facebook-sign.html">Facebook sign in</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="security-and-auth/facebook-sign.html#facebook-login-example">Facebook login example</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="security-and-auth/securing-your-app.html">Security best practices</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="security-and-auth/securing-your-app.html#never-use-the-sandbox-for-a-production-app">Never use the &#8216;sandbox&#8217; for a production app</a></li>
+<li class="toctree-l2"><a class="reference internal" href="security-and-auth/securing-your-app.html#review-permissions-in-your-apps">Review permissions in your apps</a></li>
+<li class="toctree-l2"><a class="reference internal" href="security-and-auth/securing-your-app.html#edit-the-default-role">Edit the &#8216;default&#8217; role</a></li>
+<li class="toctree-l2"><a class="reference internal" href="security-and-auth/securing-your-app.html#use-https">Use https</a></li>
+<li class="toctree-l2"><a class="reference internal" href="security-and-auth/securing-your-app.html#acquire-access-tokens-in-a-secure-way">Acquire access tokens in a secure way</a></li>
+<li class="toctree-l2"><a class="reference internal" href="security-and-auth/securing-your-app.html#treat-mobile-clients-as-untrustworthy">Treat mobile clients as untrustworthy</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="toctree-wrapper compound" id="user-management-social-graph">
+<span id="user-management-and-social-graph"></span><p class="caption"><span class="caption-text">User Management &amp; Social Graph</span><a class="headerlink" href="#user-management-social-graph" title="Permalink to this toctree">¶</a></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="user-management/user-management.html">User management &amp; social graph</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="user-management/user-management.html#user-management">User management</a></li>
+<li class="toctree-l2"><a class="reference internal" href="user-management/user-management.html#group-management">Group management</a></li>
+<li class="toctree-l2"><a class="reference internal" href="user-management/user-management.html#social-connections">Social connections</a></li>
+<li class="toctree-l2"><a class="reference internal" href="user-management/user-management.html#activity-feeds">Activity feeds</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="user-management/working-user-data.html">Working with User Data</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="user-management/working-user-data.html#creating-users">Creating users</a></li>
+<li class="toctree-l2"><a class="reference internal" href="user-management/working-user-data.html#retrieving-user-data">Retrieving user data</a></li>
+<li class="toctree-l2"><a class="reference internal" href="user-management/working-user-data.html#updating-deleting-user-data">Updating &amp; deleting user data</a></li>
+<li class="toctree-l2"><a class="reference internal" href="user-management/working-user-data.html#changing-a-user-password">Changing a user password</a></li>
+<li class="toctree-l2"><a class="reference internal" href="user-management/working-user-data.html#resetting-a-user-password">Resetting a user password</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="user-management/group.html">Working with group data</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="user-management/group.html#creating-groups">Creating groups</a></li>
+<li class="toctree-l2"><a class="reference internal" href="user-management/group.html#retrieving-groups">Retrieving groups</a></li>
+<li class="toctree-l2"><a class="reference internal" href="user-management/group.html#parameter-description">Parameter Description</a></li>
+<li class="toctree-l2"><a class="reference internal" href="user-management/group.html#retrieving-a-group-s-users">Retrieving a group&#8217;s users</a></li>
+<li class="toctree-l2"><a class="reference internal" href="user-management/group.html#deleting-a-group">Deleting a group</a></li>
+<li class="toctree-l2"><a class="reference internal" href="user-management/group.html#adding-a-user-to-a-group">Adding a user to a group</a></li>
+<li class="toctree-l2"><a class="reference internal" href="user-management/group.html#removing-a-user-from-a-group">Removing a user from a group</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="user-management/activity.html">Activity</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="user-management/activity.html#posting-activities">Posting activities</a></li>
+<li class="toctree-l2"><a class="reference internal" href="user-management/activity.html#posting-an-activity-to-a-group">Posting an activity to a group</a></li>
+<li class="toctree-l2"><a class="reference internal" href="user-management/activity.html#creating-an-activity-for-a-user-s-followers-in-a-group">Creating an activity for a user&#8217;s followers in a group</a></li>
+<li class="toctree-l2"><a class="reference internal" href="user-management/activity.html#retrieving-activity-feeds">Retrieving activity feeds</a></li>
+<li class="toctree-l2"><a class="reference internal" href="user-management/activity.html#retrieving-a-group-s-activity-feed">Retrieving a group&#8217;s activity feed</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="user-management/user-connections.html">Social Graph Connections</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="user-management/user-connections.html#following-followers">Following/followers</a></li>
+<li class="toctree-l2"><a class="reference internal" href="user-management/user-connections.html#creating-a-following-followers-connection">Creating a following/followers connection</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="user-management/messagee-example.html">App Example - Messagee</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="user-management/messagee-example.html#creating-a-user-account-in-usergrid">Creating a user account in Usergrid</a></li>
+<li class="toctree-l2"><a class="reference internal" href="user-management/messagee-example.html#creating-an-app-and-users">Creating an app and users</a></li>
+<li class="toctree-l2"><a class="reference internal" href="user-management/messagee-example.html#ios-client">iOS client</a></li>
+<li class="toctree-l2"><a class="reference internal" href="user-management/messagee-example.html#ios-sdk">iOS SDK</a></li>
+<li class="toctree-l2"><a class="reference internal" href="user-management/messagee-example.html#android-client-and-sdk">Android client and SDK</a></li>
+<li class="toctree-l2"><a class="reference internal" href="user-management/messagee-example.html#javascript-html5-client-and-sdk">Javascript/HTML5 client and SDK</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="toctree-wrapper compound" id="geo-location">
+<span id="geolocation"></span><p class="caption"><span class="caption-text">Geo-location</span><a class="headerlink" href="#geo-location" title="Permalink to this toctree">¶</a></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="geolocation/geolocation.html">Geolocating your Entities</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="geolocation/geolocation.html#saving-location-data-in-an-entity">Saving location data in an entity</a></li>
+<li class="toctree-l2"><a class="reference internal" href="geolocation/geolocation.html#querying-location-data">Querying location data</a></li>
+<li class="toctree-l2"><a class="reference internal" href="geolocation/geolocation.html#enrich-your-app-with-location-data">Enrich your app with location data</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="toctree-wrapper compound" id="assets-files">
+<span id="asset-and-file-management"></span><p class="caption"><span class="caption-text">Assets &amp; Files</span><a class="headerlink" href="#assets-files" title="Permalink to this toctree">¶</a></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="asset-and-files/uploading-assets.html">Uploading assets</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="asset-and-files/uploading-assets.html#id1">Uploading assets</a></li>
+<li class="toctree-l2"><a class="reference internal" href="asset-and-files/uploading-assets.html#updating-assets">Updating assets</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="asset-and-files/retrieving-assets.html">Retrieving assets</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="asset-and-files/retrieving-assets.html#retrieving-asset-data">Retrieving asset data</a></li>
+<li class="toctree-l2"><a class="reference internal" href="asset-and-files/retrieving-assets.html#retrieving-an-asset-entity">Retrieving an asset entity</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="asset-and-files/folders.html">Folders</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="asset-and-files/folders.html#linking-a-folder-to-an-asset">Linking a folder to an asset</a></li>
+<li class="toctree-l2"><a class="reference internal" href="asset-and-files/folders.html#retrieve-list-of-folder-assets">Retrieve list of folder assets</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="toctree-wrapper compound" id="counters-events">
+<span id="counters-and-events"></span><p class="caption"><span class="caption-text">Counters &amp; Events</span><a class="headerlink" href="#counters-events" title="Permalink to this toctree">¶</a></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="counters-and-events/creating-and-incrementing-counters.html#request-syntax">Request syntax</a></li>
+<li class="toctree-l2"><a class="reference internal" href="counters-and-events/creating-and-incrementing-counters.html#example-request">Example request</a></li>
+<li class="toctree-l2"><a class="reference internal" href="counters-and-events/creating-and-incrementing-counters.html#example-response">Example response</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="counters-and-events/retrieving-counters.html">Retrieving counters</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="counters-and-events/retrieving-counters.html#request-syntax">Request syntax</a></li>
+<li class="toctree-l2"><a class="reference internal" href="counters-and-events/retrieving-counters.html#example-request">Example request</a></li>
+<li class="toctree-l2"><a class="reference internal" href="counters-and-events/retrieving-counters.html#example-response">Example response</a></li>
+<li class="toctree-l2"><a class="reference internal" href="counters-and-events/retrieving-counters.html#retrieving-counters-by-time-interval">Retrieving counters by time interval</a></li>
+<li class="toctree-l2"><a class="reference internal" href="counters-and-events/retrieving-counters.html#id1">Request syntax</a></li>
+<li class="toctree-l2"><a class="reference internal" href="counters-and-events/retrieving-counters.html#id2">Example request</a></li>
+<li class="toctree-l2"><a class="reference internal" href="counters-and-events/retrieving-counters.html#id3">Example response</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="toctree-wrapper compound" id="organizations-applications">
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span><a class="headerlink" href="#organizations-applications" title="Permalink to this toctree">¶</a></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="orgs-and-apps/organization.html">Organization</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="orgs-and-apps/organization.html#creating-an-organization">Creating an organization</a></li>
+<li class="toctree-l2"><a class="reference internal" href="orgs-and-apps/organization.html#getting-an-organization">Getting an organization</a></li>
+<li class="toctree-l2"><a class="reference internal" href="orgs-and-apps/organization.html#activating-an-organization">Activating an organization</a></li>
+<li class="toctree-l2"><a class="reference internal" href="orgs-and-apps/organization.html#reactivating-an-organization">Reactivating an organization</a></li>
+<li class="toctree-l2"><a class="reference internal" href="orgs-and-apps/organization.html#generating-organization-client-credentials">Generating organization client credentials</a></li>
+<li class="toctree-l2"><a class="reference internal" href="orgs-and-apps/organization.html#retrieving-organization-client-credentials">Retrieving organization client credentials</a></li>
+<li class="toctree-l2"><a class="reference internal" href="orgs-and-apps/organization.html#getting-an-organization-s-activity-feed">Getting an organization&#8217;s activity feed</a></li>
+<li class="toctree-l2"><a class="reference internal" href="orgs-and-apps/organization.html#getting-the-applications-in-an-organization">Getting the applications in an organization</a></li>
+<li class="toctree-l2"><a class="reference internal" href="orgs-and-apps/organization.html#adding-an-admin-user-to-an-organization">Adding an admin user to an organization</a></li>
+<li class="toctree-l2"><a class="reference internal" href="orgs-and-apps/organization.html#getting-the-admin-users-in-an-organization">Getting the admin users in an organization</a></li>
+<li class="toctree-l2"><a class="reference internal" href="orgs-and-apps/organization.html#removing-an-admin-user-from-an-organization">Removing an admin user from an organization</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="orgs-and-apps/application.html">Application</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="orgs-and-apps/application.html#creating-an-application">Creating an application</a></li>
+<li class="toctree-l2"><a class="reference internal" href="orgs-and-apps/application.html#generating-application-credentials">Generating application credentials</a></li>
+<li class="toctree-l2"><a class="reference internal" href="orgs-and-apps/application.html#getting-application-credentials">Getting application credentials</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="toctree-wrapper compound" id="api-reference">
+<span id="rest-endpoints"></span><p class="caption"><span class="caption-text">API Reference</span><a class="headerlink" href="#api-reference" title="Permalink to this toctree">¶</a></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="rest-endpoints/api-docs.html">Methods</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#action-methods">Action Methods</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#activityfeed-methods">ActivityFeed Methods</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#appdata-methods">AppData Methods</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#credential-methods">Credential Methods</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#devices-methods">Devices Methods</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#entity-methods">Entity Methods</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#event-methods">Event Methods</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#group-methods">Group Methods</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#notification-methods">Notification Methods</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#organization-methods">Organization Methods</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#permission-methods">Permission Methods</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#receipt-methods">Receipt Methods</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#role-methods">Role Methods</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#user-methods">User Methods</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="rest-endpoints/api-docs.html#models">Models</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#action">Action</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#activityfeed">ActivityFeed</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#actor">Actor</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#addpermission">AddPermission</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#addrole">AddRole</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#adminuserupdate">AdminUserUpdate</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#appdata">AppData</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#cancelmsg">CancelMSG</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#collections">Collections</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#createactivity">CreateActivity</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#createadminuser">CreateAdminUser</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#createapp">CreateApp</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#createentities">CreateEntities</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#createentity">CreateEntity</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#createevent">CreateEvent</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#creategroup">CreateGroup</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#createnotification">CreateNotification</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#createnotifications">CreateNotifications</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#createorg">CreateOrg</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#createuser">CreateUser</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#credential">Credential</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#device">Device</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#entity">Entity</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#error">Error</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#event">Event</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#group">Group</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#imagemodel">ImageModel</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#metadata">Metadata</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#notification">Notification</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#notifier">Notifier</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#object">Object</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#organization">Organization</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#permission">Permission</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#receipt">Receipt</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#resetpw">ResetPW</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#resetpwmsg">ResetPWMsg</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#role">Role</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#schedulenotification">ScheduleNotification</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#setexpiration">SetExpiration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#sets">Sets</a></li>
+<li class="toctree-l2"><a class="reference internal" href="rest-endpoints/api-docs.html#user">User</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="toctree-wrapper compound" id="client-sdks">
+<span id="sdks"></span><p class="caption"><span class="caption-text">Client SDKs</span><a class="headerlink" href="#client-sdks" title="Permalink to this toctree">¶</a></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+</div>
+<div class="toctree-wrapper compound" id="installing-the-stack">
+<span id="installation"></span><p class="caption"><span class="caption-text">Installing the Stack</span><a class="headerlink" href="#installing-the-stack" title="Permalink to this toctree">¶</a></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="installation/ug1-deploy-to-tomcat.html#requirements">Requirements</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation/ug1-deploy-to-tomcat.html#download">Download</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation/ug1-deploy-to-tomcat.html#building">Building</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation/ug1-deploy-to-tomcat.html#install-and-configure-cassandra">Install and configure Cassandra</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation/ug1-deploy-to-tomcat.html#install-and-configure-tomcat">Install and configure Tomcat</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation/ug1-deploy-to-tomcat.html#add-usergrid-war-to-tomcat">Add Usergrid WAR to Tomcat</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation/ug1-deploy-to-tomcat.html#add-usergrid-configuration-file-to-tomcat">Add Usergrid configuration file to Tomcat</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation/ug1-deploy-to-tomcat.html#run-usergrid-database-super-user-setup">Run Usergrid Database &amp; Super User Setup</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation/ug1-deploy-to-tomcat.html#build-the-usergrid-console">Build the Usergrid Console</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation/ug1-deploy-to-tomcat.html#login-to-the-usergrid-console-get-started">Login to the Usergrid Console &amp; get started</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation/ug1-deploy-to-tomcat.html#example-usergrid-custom-properties-file">Example <strong>usergrid-custom.properties</strong> file</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="installation/ug1-launcher-quick-start.html#requirements">Requirements</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation/ug1-launcher-quick-start.html#download">Download</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation/ug1-launcher-quick-start.html#running">Running</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation/ug1-launcher-quick-start.html#getting-started-with-the-http-api">Getting Started with the HTTP API</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="installation/ug2-deploy-to-tomcat.html#requirements">Requirements</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation/ug2-deploy-to-tomcat.html#running">Running</a></li>
+<li class="toctree-l2"><a class="reference internal" href="installation/ug2-deploy-to-tomcat.html#example-usergrid-deployment-properties-file">Example <strong>usergrid-deployment.properties</strong> file</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="toctree-wrapper compound" id="more-about-usergrid">
+<span id="about"></span><p class="caption"><span class="caption-text">More about Usergrid</span><a class="headerlink" href="#more-about-usergrid" title="Permalink to this toctree">¶</a></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="reference/presos-and-videos.html">Presentations &amp; Videos</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="reference/presos-and-videos.html#building-mobile-apps-with-apache-usergrid">Building Mobile Apps with Apache Usergrid</a></li>
+<li class="toctree-l2"><a class="reference internal" href="reference/presos-and-videos.html#how-to-contribute-to-apache-usergrid">How to Contribute to Apache Usergrid</a></li>
+<li class="toctree-l2"><a class="reference internal" href="reference/presos-and-videos.html#apache-usergrid-internals">Apache Usergrid Internals</a></li>
+<li class="toctree-l2"><a class="reference internal" href="reference/presos-and-videos.html#open-source-mobile-backend-on-cassandra">Open Source Mobile Backend on Cassandra</a></li>
+<li class="toctree-l2"><a class="reference internal" href="reference/presos-and-videos.html#usergrid-overview">Usergrid Overview</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="reference/contribute-code.html">How to Contribute Code &amp; Docs</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="reference/contribute-code.html#code-contributions">Code Contributions</a></li>
+<li class="toctree-l2"><a class="reference internal" href="reference/contribute-code.html#website-and-documentation-contributions">Website and Documentation Contributions</a></li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+      
+        <a href="introduction/usergrid-features.html" class="btn btn-neutral float-right" title="Usergrid Features" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+      
+      
+    </div>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'./',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="_static/jquery.js"></script>
+      <script type="text/javascript" src="_static/underscore.js"></script>
+      <script type="text/javascript" src="_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/installation/ug1-deploy-to-tomcat.html
----------------------------------------------------------------------
diff --git a/content/docs/installation/ug1-deploy-to-tomcat.html b/content/docs/installation/ug1-deploy-to-tomcat.html
new file mode 100644
index 0000000..5a13447
--- /dev/null
+++ b/content/docs/installation/ug1-deploy-to-tomcat.html
@@ -0,0 +1,506 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>Usegrid 1: Deploying to Tomcat &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+        <link rel="next" title="Usegrid 1: Launcher Quick-start" href="ug1-launcher-quick-start.html"/>
+        <link rel="prev" title="COMING SOON..." href="../sdks/tbd.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul class="current">
+<li class="toctree-l1 current"><a class="current reference internal" href="">Usegrid 1: Deploying to Tomcat</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#requirements">Requirements</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#download">Download</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#building">Building</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#install-and-configure-cassandra">Install and configure Cassandra</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#install-and-configure-tomcat">Install and configure Tomcat</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#add-usergrid-war-to-tomcat">Add Usergrid WAR to Tomcat</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#add-usergrid-configuration-file-to-tomcat">Add Usergrid configuration file to Tomcat</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#run-usergrid-database-super-user-setup">Run Usergrid Database &amp; Super User Setup</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#build-the-usergrid-console">Build the Usergrid Console</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#login-to-the-usergrid-console-get-started">Login to the Usergrid Console &amp; get started</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#example-usergrid-custom-properties-file">Example <strong>usergrid-custom.properties</strong> file</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>Usegrid 1: Deploying to Tomcat</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/installation/ug1-deploy-to-tomcat.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="usegrid-1-deploying-to-tomcat">
+<h1>Usegrid 1: Deploying to Tomcat<a class="headerlink" href="#usegrid-1-deploying-to-tomcat" title="Permalink to this headline">¶</a></h1>
+<p>This is a guide that explains how to install and run Usergrid using
+stock Tomcat and Cassandra on a single computer.</p>
+<p>NOTE: running Cassandra on a single computer is something you should do
+ONLY for testing purposes. You don&#8217;t want to run one node in production
+even just to start out. To get the benefit of Cassandra&#8217;s architecture,
+which is designed to support linear scalability. You should be running a
+Cassandra cluster with at least three nodes.</p>
+<p>For more information:</p>
+<ul class="simple">
+<li><a class="reference external" href="http://planetcassandra.org/blog/post/cassandra-faq-can-i-start-with-a-single-node/">Cassandra FAQ: Can I Start With a Single
+Node?</a></li>
+<li><a class="reference external" href="http://stackoverflow.com/questions/18462530/why-dont-you-start-off-with-a-single-small-cassandra-server-as-you-usually">Why don&#8217;t you start off with a “single &amp; small” Cassandra
+server</a></li>
+</ul>
+<div class="section" id="requirements">
+<h2>Requirements<a class="headerlink" href="#requirements" title="Permalink to this headline">¶</a></h2>
+<ul class="simple">
+<li><a class="reference external" href="http://www.oracle.com/technetwork/java/javase/downloads/index.html">JDK
+1.7</a></li>
+<li><a class="reference external" href="http://maven.apache.org/">Maven</a></li>
+</ul>
+</div>
+<div class="section" id="download">
+<h2>Download<a class="headerlink" href="#download" title="Permalink to this headline">¶</a></h2>
+<p>Use GitHub to clone the
+<a class="reference external" href="https://github.com/apache/incubator-usergrid">apache/incubator-usergrid</a>
+repo.</p>
+<p>Or you can start by <a class="reference external" href="https://github.com/apache/incubator-usergrid/archive/master.zip">downloading our latest
+code</a>
+and extract it.</p>
+</div>
+<div class="section" id="building">
+<h2>Building<a class="headerlink" href="#building" title="Permalink to this headline">¶</a></h2>
+<p>From the command line, navigate to <code class="docutils literal"><span class="pre">stack</span></code> directory and type the
+following:</p>
+<div class="highlight-python"><div class="highlight"><pre>mvn clean package -DskipTests=true
+</pre></div>
+</div>
+<p>Once you are done the Usergrid application will be package as a Java EE
+WAR file at the location <strong>stack/rest/target/ROOT.war</strong>.</p>
+</div>
+<div class="section" id="install-and-configure-cassandra">
+<h2>Install and configure Cassandra<a class="headerlink" href="#install-and-configure-cassandra" title="Permalink to this headline">¶</a></h2>
+<p>Install Cassandra, don&#8217;t edit configuration files as we just want
+default values for this simple setup. Here are the <a class="reference external" href="http://wiki.apache.org/cassandra/GettingStarted">instructions for
+installing
+Cassandra</a></p>
+</div>
+<div class="section" id="install-and-configure-tomcat">
+<h2>Install and configure Tomcat<a class="headerlink" href="#install-and-configure-tomcat" title="Permalink to this headline">¶</a></h2>
+<p>Follow instructions, don&#8217;t edit configuration files as we just want
+default values for this simple setup. Here are the <a class="reference external" href="http://tomcat.apache.org/tomcat-7.0-doc/setup.html">instructions for
+installing Tomcat
+7</a></p>
+</div>
+<div class="section" id="add-usergrid-war-to-tomcat">
+<h2>Add Usergrid WAR to Tomcat<a class="headerlink" href="#add-usergrid-war-to-tomcat" title="Permalink to this headline">¶</a></h2>
+<p>Remove the existing <code class="docutils literal"><span class="pre">tomcat/webapps/ROOT</span></code> directory.</p>
+<p>Place the Usergrid <code class="docutils literal"><span class="pre">ROOT.war</span></code> file into the <code class="docutils literal"><span class="pre">tomcat/webapps</span></code>
+directory</p>
+</div>
+<div class="section" id="add-usergrid-configuration-file-to-tomcat">
+<h2>Add Usergrid configuration file to Tomcat<a class="headerlink" href="#add-usergrid-configuration-file-to-tomcat" title="Permalink to this headline">¶</a></h2>
+<p>Create a ____usergrid-custom.properties____ file and place it in
+Tomcat&#8217;s <strong>lib</strong> directory. You can find an example properties file
+below that should work well for a local Tomcat &amp; Cassandra setup. You
+will probably only need to change the properties below to use your email
+address and preferred password for the install.</p>
+<div class="highlight-python"><div class="highlight"><pre>usergrid.sysadmin.login.allowed=true
+usergrid.sysadmin.login.name=superuser
+usergrid.sysadmin.login.password=pw123
+usergrid.sysadmin.email=me@example.com
+usergrid.sysadmin.login.email=myself@example.com
+usergrid.management.mailer=Myself&lt;myself@example.com&gt;
+usergrid.test-account.admin-user.email=myself@example.com
+usergrid.test-account.admin-user.password=test
+</pre></div>
+</div>
+</div>
+<div class="section" id="run-usergrid-database-super-user-setup">
+<h2>Run Usergrid Database &amp; Super User Setup<a class="headerlink" href="#run-usergrid-database-super-user-setup" title="Permalink to this headline">¶</a></h2>
+<p>Start Tomcat and use your web browser to visit the URLs below. While you
+do this you might want to watch the logs under tomcat/logs for clues,
+just in case anything goes wrong.</p>
+<p>Database setup URL - <a class="reference external" href="http://localhost:8080/system/database/setup">http://localhost:8080/system/database/setup</a></p>
+<p>When prompted to login use the sysadmin credentials that you specified
+in your <strong>usergrid-custom.properties</strong> file. Based on the example above
+that would be superuser and pw123. If the operation is successful you
+should a message like the one below in your browser. If not, check your
+logs for clues about what went wrong.</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+  <span class="s">&quot;action&quot;</span> <span class="p">:</span> <span class="s">&quot;cassandra setup&quot;</span><span class="p">,</span>
+  <span class="s">&quot;status&quot;</span> <span class="p">:</span> <span class="s">&quot;ok&quot;</span><span class="p">,</span>
+  <span class="s">&quot;timestamp&quot;</span> <span class="p">:</span> <span class="mi">1379424622947</span><span class="p">,</span>
+  <span class="s">&quot;duration&quot;</span> <span class="p">:</span> <span class="mi">76</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+<p>Superuser setup URL - <a class="reference external" href="http://localhost:8080/system/superuser/setup">http://localhost:8080/system/superuser/setup</a></p>
+<p>You should not be prompted for login because you already logged into for
+the Database Setup. If setup works, you should see a message like this:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+  <span class="s">&quot;action&quot;</span> <span class="p">:</span> <span class="s">&quot;superuser setup&quot;</span><span class="p">,</span>
+  <span class="s">&quot;status&quot;</span> <span class="p">:</span> <span class="s">&quot;ok&quot;</span><span class="p">,</span>
+  <span class="s">&quot;timestamp&quot;</span> <span class="p">:</span> <span class="mi">1379424667936</span><span class="p">,</span>
+  <span class="s">&quot;duration&quot;</span> <span class="p">:</span> <span class="mi">2</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="build-the-usergrid-console">
+<h2>Build the Usergrid Console<a class="headerlink" href="#build-the-usergrid-console" title="Permalink to this headline">¶</a></h2>
+<p>The Usergrid Console is an admin interface written in JavaScript that
+connects to your running Usergrid instance. For evaluation purposes, you
+can run it within Tomcat. Build it by following the steps
+<a class="reference external" href="https://github.com/apache/incubator-usergrid/blob/master/portal/README.md">here</a>.
+Once built, copy the directory <em>portal/build/usergrid-portal</em> to
+<em>tomcat/webapps</em>.</p>
+</div>
+<div class="section" id="login-to-the-usergrid-console-get-started">
+<h2>Login to the Usergrid Console &amp; get started<a class="headerlink" href="#login-to-the-usergrid-console-get-started" title="Permalink to this headline">¶</a></h2>
+<p>You should now be able to login to the Usergrid console and start
+configuring applications, users and more.</p>
+<p>You can use an static version of the portal to get started:</p>
+<p><a class="reference external" href="http://localhost:8080/usergrid-portal/(http://localhost:8080/usergrid-portal">http://localhost:8080/usergrid-portal/(http://localhost:8080/usergrid-portal</a>)</p>
+</div>
+<div class="section" id="example-usergrid-custom-properties-file">
+<h2>Example <strong>usergrid-custom.properties</strong> file<a class="headerlink" href="#example-usergrid-custom-properties-file" title="Permalink to this headline">¶</a></h2>
+<p>Here&#8217;s a complete example properties file to get you started.</p>
+<div class="highlight-python"><div class="highlight"><pre># Minimal Usergrid configuration properties for local Tomcat and Cassandra
+#
+# The cassandra configuration options.
+
+# The cassandra host to use
+cassandra.url=localhost:9160
+
+# if your cassandra instance requires username/password
+cassandra.username=someuser
+cassandra.password=somepassword
+
+# The strategy to use when creating the keyspace. This is the default.
+# We recommend creating the keyspace with this default, then editing it
+# via the cassandra CLI to meet the client&#39;s needs.
+cassandra.keyspace.strategy=org.apache.cassandra.locator.SimpleStrategy
+
+# The default replication factor for the simple strategy. Again, leave the
+# default, create the app, then use the cassandra cli to set the replication
+# factor options. This can become complicated with different topologies and
+# is more a Cassandra administration issue than a UG issue.
+cassandra.keyspace.strategy.options.replication_factor=1
+
+######################################################
+# Custom mail transport. Not usually used for local testing
+
+#mail.transport.protocol=smtps
+#mail.smtps.host=email-smtp.us-east-1.amazonaws.com
+#mail.smtps.port=465
+#mail.smtps.auth=true
+#mail.smtps.quitwait=false
+#mail.smtps.username=
+#mail.smtps.password=
+
+######################################################
+# Admin and test user setup (change these to be their super user
+
+usergrid.sysadmin.login.name=superuser
+usergrid.sysadmin.login.email=myself@example.com     &lt;--- Change this
+usergrid.sysadmin.login.password=pw123               &lt;--- Change this
+usergrid.sysadmin.login.allowed=true
+usergrid.sysadmin.email=myself@example.com           &lt;--- Change this
+
+# Enable or disable this to require superadmin approval of users
+usergrid.sysadmin.approve.users=false
+
+######################################################
+# Auto-confirm and sign-up notifications settings
+
+usergrid.management.admin_users_require_confirmation=false
+usergrid.management.admin_users_require_activation=false
+usergrid.management.organizations_require_activation=false
+usergrid.management.notify_sysadmin_of_new_organizations=false
+usergrid.management.notify_sysadmin_of_new_admin_users=false
+
+######################################################
+# URLs
+# Redirect path when request come in for TLD
+
+usergrid.redirect_root=https://localhost:8080/status
+usergrid.view.management.organizations.organization.activate=https://localhost:8080/accounts/welcome
+usergrid.view.management.organizations.organization.confirm=https://localhost:8080/accounts/welcome
+usergrid.view.management.users.user.activate=https://localhost:8080/accounts/welcome
+usergrid.view.management.users.user.confirm=https://localhost:8080/accounts/welcome
+usergrid.organization.activation.url=https://localhost:8080/management/organizations/%s/activate
+usergrid.admin.activation.url=https://localhost:8080/management/users/%s/activate
+usergrid.admin.resetpw.url=https://localhost:8080/management/users/%s/resetpw
+usergrid.admin.confirmation.url=https://localhost:8080/management/users/%s/confirm
+usergrid.user.activation.url=https://localhost:8080%s/%s/users/%s/activate
+usergrid.user.confirmation.url=https://localhost:8080/%s/%s/users/%s/confirm
+usergrid.user.resetpw.url=https://localhost:8080/%s/%s/users/%s/resetpw
+</pre></div>
+</div>
+</div>
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+      
+        <a href="ug1-launcher-quick-start.html" class="btn btn-neutral float-right" title="Usegrid 1: Launcher Quick-start" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+      
+      
+        <a href="../sdks/tbd.html" class="btn btn-neutral" title="COMING SOON..." accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+      
+    </div>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

[47/60] [abbrv] incubator-usergrid git commit: Adding in missing Using Roles section (incomplete).

[sn...@apache.org]

Adding in missing Using Roles section (incomplete).

(cherry picked from commit 51734d426220388e569c0e60a4e4a0c96e030183)


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/c3fb3317
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/c3fb3317
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/c3fb3317

Branch: refs/heads/two-dot-o-dev
Commit: c3fb3317ecde817eaa260ec141a517216e121daf
Parents: d5b28b2
Author: Dave Johnson <sn...@apache.org>
Authored: Thu Aug 6 11:38:21 2015 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Wed Aug 12 13:02:46 2015 -0400

----------------------------------------------------------------------
 docs/_static/css/theme.css            |   8 +-
 docs/index.rst                        |   7 +-
 docs/security-and-auth/using-roles.md | 293 +++++++++++++++++++++++++++++
 3 files changed, 303 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c3fb3317/docs/_static/css/theme.css
----------------------------------------------------------------------
diff --git a/docs/_static/css/theme.css b/docs/_static/css/theme.css
index 870e633..f225469 100755
--- a/docs/_static/css/theme.css
+++ b/docs/_static/css/theme.css
@@ -5321,6 +5321,10 @@ span[id*='MathJax-Span'] {
     margin-bottom: 2em;
 }
 
+.usergrid-30 {
+    width:30%;
+}
+
 .usergrid-table tr td {
     padding: 0.5em;
     border: 1px solid grey;
@@ -5356,7 +5360,7 @@ h2.usergrid-DELETE-heading {
     margin-bottom: 2em;
 }
 
-/* css from petstore example */
+/* css from petstore example 
 
 body {
     font-family: Trebuchet MS, sans-serif;
@@ -5510,5 +5514,5 @@ code {
     text-decoration: none;
 }
 
-
+*/
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c3fb3317/docs/index.rst
----------------------------------------------------------------------
diff --git a/docs/index.rst b/docs/index.rst
index e25eebc..e3fab8f 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -63,6 +63,7 @@ Apache Usergrid Documentation
   
    security-and-auth/app-security
    security-and-auth/using-permissions
+   security-and-auth/using-roles
    security-and-auth/authenticating-users-and-application-clients
    security-and-auth/user-authentication-types
    security-and-auth/changing-token-time-live-ttl
@@ -98,9 +99,9 @@ Apache Usergrid Documentation
    :maxdepth: 2
    :caption: Assets & Files
   
-   asset-and-files/uploading-assets.md
-   asset-and-files/retrieving-assets.md
-   asset-and-files/folders.md
+   assets-and-files/uploading-assets.md
+   assets-and-files/retrieving-assets.md
+   assets-and-files/folders.md
    
 .. _counters-and-events:
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c3fb3317/docs/security-and-auth/using-roles.md
----------------------------------------------------------------------
diff --git a/docs/security-and-auth/using-roles.md b/docs/security-and-auth/using-roles.md
new file mode 100644
index 0000000..3428405
--- /dev/null
+++ b/docs/security-and-auth/using-roles.md
@@ -0,0 +1,293 @@
+# Using roles
+Roles are named sets of one or more permissions, and are useful for defining specific access levels to resources in your API BaaS data store. Multiple roles can be assigned to a user or group, giving you a great deal of flexibility in how access to resources are defined.
+
+For example, in a blogging app you might create a 'reviewer' role that allows GET and PUT access to an articles collection to allow the user to retrieve and update articles, but not allow them to create new articles.
+
+## Default roles
+While you can create as many custom roles as you want per application, all API BaaS applications include three default roles. These roles each serve a special purpose and should not be deleted; however, you can and should adjust the permissions assigned to these roles to suit the needs of you app.
+
+The following table describes each pre-defined role, and the permissions that are assigned to them by default.
+
+<table class="usergrid-table">
+<tr>
+  <th>Role</th>
+  <th class="usergrid-30"> Permissions</th>
+  <th>Description</th>
+</tr>
+<tr>
+  <td>Guest</td>
+  <td>
+  
+* post: /devices
+* post: /users
+* put: /devices/*
+  
+  </td>
+  <td>
+  
+  Assigned to all unauthenticated requests. Includes a basic set of permissions that are commonly needed by unregistered or unauthenticated users. 
+  <p>Grants permission for a user to create a user account and for their device to be registered.
+      
+  </td>
+</tr>
+<tr>
+  <td>Default</td>
+  <td>
+  
+* get, post, put, delete: /**
+
+  </td>
+  <td>
+  
+ Default for authenticated users. Assigns the associated permissions to all users whose requests are authenticated with a valid access token.
+
+ <div class="admonition warning"> <p class="first admonition-title">WARNING</p> <p class="last">

+ __Note__: By default, __grants full access for all resources in your application__. A first task in securing your application should be to restrict access by redefining this role to narrow the access it provides. Remove the default full permission rule and add restrictive permission rules for a production deployment. 
+ </p></div>
+  
+  </td>
+</tr>
+<tr>
+  <td>Administrator</td>
+  <td></td>
+  <td></td>
+</tr>
+<tr>
+  <td></td>
+  <td></td>
+  <td></td>
+</tr>
+<tr>
+  <td></td>
+  <td></td>
+  <td></td>
+</tr>
+</table>
+
+Role	Permissions	Description
+Guest	
+post: /devices
+post: /users
+put: /devices/*
+Assigned to all unauthenticated requests. Includes a basic set of permissions that are commonly needed by unregistered or unauthenticated users.
+
+Grants permission for a user to create a user account and for their device to be registered.
+
+Default	
+get, post, put, delete: /**
+Default for authenticated users. Assigns the associated permissions to all users whose requests are authenticated with a valid access token.
+
+By default, grants full access for all resources in your application. A first task in securing your application should be to restrict access by redefining this role to narrow the access it provides. Remove the default full permission rule and add restrictive permission rules for a production deployment.
+Administrator	
+None
+
+Unused until you associate it with users or groups. By default, includes no permissions that provide access.
+
+Grants no access. Consider this a blank slate. Add permission rules and associate this role with users and groups as needed.
+
+Note: The Administrator role is not the same as an organization administrator -- that is, someone who authenticates as an Admin User. The Admin User is an implicit user created when you create an organization. After authenticating, the Admin User has full access to all of the administration features of the API BaaS API. By comparison, the Administrator role is simply a role (initially without permissions) that can be assigned to any user.
+
+## Creating roles
+Generally, it is easiest to a create a role for each access type you want to enable in your app. You may, however, assign multiple roles to any user or group entity, so you have the flexibility to define any schema for applying roles that you like.
+
+The following shows how to create a new role and assign permissions to it.
+
+### Request syntax
+With cURL requests a role entity is created with a POST request, then permissions must be assigned to it with a separate request. For more on assigning permissions with cURL, see Using permissions.
+
+The following details how to create a new role entity.
+
+    curl -X POST https://api.usergrid.com/<org>/<app>/roles -d '{"name":<roleName>}'
+    
+Parameters
+
+Parameter Description
+--------- -----------
+org	      Organization UUID or organization name
+app	      Application UUID or application name
+roleName  The name of the role to be created
+
+### Example request
+
+    curl -X POST "https://api.usergrid.com/my-org/my-app/roles/ -d '{"name":"manager"}'
+
+### Example response
+
+    {
+      "action" : "post",
+      "application" : "f34f4222-a166-11e2-a7f7-02e81adcf3d0",
+      "params" : { },
+      "path" : "/roles",
+      "uri" : "https://api.usergrid.com/your-org/your-app/roles",
+      "entities" : [ {
+        "uuid" : "382d0991-74bb-3548-8166-6b07e44495ef",
+        "type" : "role",
+        "name" : "manager",
+        "created" : 1402612783104,
+        "modified" : 1402612783104,
+        "roleName" : "manager",
+        "title" : "manager",
+        "inactivity" : 0,
+        "metadata" : {
+          "path" : "/roles/382d0991-74bb-3548-8166-6b07e44495ef",
+          "sets" : {
+            "permissions" : "/roles/382d0991-74bb-3548-8166-6b07e44495ef/permissions"
+          },
+          "collections" : {
+            "groups" : "/roles/382d0991-74bb-3548-8166-6b07e44495ef/groups",
+            "users" : "/roles/382d0991-74bb-3548-8166-6b07e44495ef/users"
+          }
+        }
+      } ],
+      "timestamp" : 1402612783102,
+      "duration" : 30,
+      "organization" : "your-org",
+      "applicationName" : "your-app"
+    }		
+		
+## Assigning roles
+Once you have created some roles, you will need to explicitly assign them to a user or group entity. The permissions associated with that role will be granted to the entity immediately for any requests they send that are authenticated by a valid access token. Please note that assigning a role to a group will grant the associated permissions to every user in that group.
+
+The following shows how to assign a role to an entity.
+
+### Request syntax
+
+    curl -X POST https://api.usergrid.com/<org>/<app>/roles/<roleName>/<entityType>/<entityID>
+
+Parameters
+
+Parameter	Description
+---------   -----------
+org	        Organization UUID or organization name
+app	        Application UUID or application name
+roleName	The name of the role to be created
+entityType	The type of the entity the role is being assigned to. 'Group' and 'user' are valid values.
+entityID	The UUID of the entity the role is being assigned to. 
+
+For groups, the 'name' property can be used. For users, the 'username' property can be used.
+
+### Example request
+
+    curl -X POST "https://api.usergrid.com/my-org/my-app/roles/manager/users/someUser
+    
+
+### Example response
+{
+  "action" : "post",
+  "application" : "f34f4222-a166-11e2-a7f7-02e81adcf3d0",
+  "params" : { },
+  "path" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users",
+  "uri" : "https://api.usergrid.com/your-org/your-app/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users",
+  "entities" : [ {
+    "uuid" : "410b213a-b379-11e3-a0e5-9953085ea376",
+    "type" : "user",
+    "name" : "someUser",
+    "created" : 1395681911491,
+    "modified" : 1399070010291,
+    "username" : "someUser",
+    "activated" : true,
+    "file" : "fobnszewobnioerabnoiawegbrn\n",    
+    "metadata" : {
+      "connecting" : {
+        "friends" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/connecting/friends",
+        "likes" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/connecting/likes"
+      },
+      "path" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376",
+      "sets" : {
+        "rolenames" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/roles",
+        "permissions" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/permissions"
+      },
+      "connections" : {
+        "completed" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/completed",
+        "follows" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/follows"
+      },
+      "collections" : {
+        "activities" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/activities",
+        "devices" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/devices",
+        "feed" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/feed",
+        "groups" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/groups",
+        "roles" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/roles",
+        "following" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/following",
+        "followers" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/followers"
+      }
+    }
+  } ],
+  "timestamp" : 1402965083889,
+  "duration" : 41,
+  "organization" : "your-org",
+  "applicationName" : "your-app"
+}		
+		
+## Removing roles
+At times it may be necessary to remove a role from a user or group entity, for example if a user changes jobs, or the duties of a group are altered. Please note that removing a role from a group will remove the associated permissions from every user in that group.
+
+The following shows how to remove a role from an entity.
+
+### Request syntax
+
+    curl -X DELETE https://api.usergrid.com/<org>/<app>/roles/<roleName>/<entityType>/<entityID>
+    
+Parameters
+
+Parameter	Description
+---------   -----------
+org	        Organization UUID or organization name
+app	        Application UUID or application name
+roleName	The name of the role to be created
+entityType	The type of the entity the role is being removed from. 'Group' and 'user' are valid values.
+entityID	The UUID of the entity the role is being removed from. 
+
+For groups, the 'name' property can be used. For users, the 'username' property can be used.
+
+### Example request
+
+    curl -X DELETE https://api.usergrid.com/my-org/my-app/roles/manager/users/someUser
+    
+
+### Example response
+
+    {
+      "action" : "delete",
+      "application" : "f34f4222-a166-11e2-a7f7-02e81adcf3d0",
+      "params" : { },
+      "path" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users",
+      "uri" : "https://api.usergrid.com/your-org/your-app/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users",
+      "entities" : [ {
+        "uuid" : "410b213a-b379-11e3-a0e5-9953085ea376",
+        "type" : "user",
+        "name" : "someUser",
+        "created" : 1395681911491,
+        "modified" : 1399070010291,
+        "username" : "someUser",
+        "activated" : true,
+        "metadata" : {
+          "connecting" : {
+            "friends" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/connecting/friends",
+            "likes" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/connecting/likes"
+          },
+          "path" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376",
+          "sets" : {
+            "rolenames" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/roles",
+            "permissions" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/permissions"
+          },
+          "connections" : {
+            "completed" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/completed",
+            "follows" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/follows"
+          },
+          "collections" : {
+            "activities" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/activities",
+            "devices" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/devices",
+            "feed" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/feed",
+            "groups" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/groups",
+            "roles" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/roles",
+            "following" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/following",
+            "followers" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/followers"
+          }
+        }
+      } ],
+      "timestamp" : 1403214283808,
+      "duration" : 358,
+      "organization" : "your-org",
+      "applicationName" : "your-app"
+    }	
+    
\ No newline at end of file

[30/60] [abbrv] incubator-usergrid git commit: cherry picking docs from master

[sn...@apache.org]

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_static/fonts/fontawesome-webfont.svg
----------------------------------------------------------------------
diff --git a/content/docs/_static/fonts/fontawesome-webfont.svg b/content/docs/_static/fonts/fontawesome-webfont.svg
new file mode 100644
index 0000000..45fdf33
--- /dev/null
+++ b/content/docs/_static/fonts/fontawesome-webfont.svg
@@ -0,0 +1,414 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata></metadata>
+<defs>
+<font id="fontawesomeregular" horiz-adv-x="1536" >
+<font-face units-per-em="1792" ascent="1536" descent="-256" />
+<missing-glyph horiz-adv-x="448" />
+<glyph unicode=" "  horiz-adv-x="448" />
+<glyph unicode="&#x09;" horiz-adv-x="448" />
+<glyph unicode="&#xa0;" horiz-adv-x="448" />
+<glyph unicode="&#xa8;" horiz-adv-x="1792" />
+<glyph unicode="&#xa9;" horiz-adv-x="1792" />
+<glyph unicode="&#xae;" horiz-adv-x="1792" />
+<glyph unicode="&#xb4;" horiz-adv-x="1792" />
+<glyph unicode="&#xc6;" horiz-adv-x="1792" />
+<glyph unicode="&#x2000;" horiz-adv-x="768" />
+<glyph unicode="&#x2001;" />
+<glyph unicode="&#x2002;" horiz-adv-x="768" />
+<glyph unicode="&#x2003;" />
+<glyph unicode="&#x2004;" horiz-adv-x="512" />
+<glyph unicode="&#x2005;" horiz-adv-x="384" />
+<glyph unicode="&#x2006;" horiz-adv-x="256" />
+<glyph unicode="&#x2007;" horiz-adv-x="256" />
+<glyph unicode="&#x2008;" horiz-adv-x="192" />
+<glyph unicode="&#x2009;" horiz-adv-x="307" />
+<glyph unicode="&#x200a;" horiz-adv-x="85" />
+<glyph unicode="&#x202f;" horiz-adv-x="307" />
+<glyph unicode="&#x205f;" horiz-adv-x="384" />
+<glyph unicode="&#x2122;" horiz-adv-x="1792" />
+<glyph unicode="&#x221e;" horiz-adv-x="1792" />
+<glyph unicode="&#x2260;" horiz-adv-x="1792" />
+<glyph unicode="&#xe000;" horiz-adv-x="500" d="M0 0z" />
+<glyph unicode="&#xf000;" horiz-adv-x="1792" d="M1699 1350q0 -35 -43 -78l-632 -632v-768h320q26 0 45 -19t19 -45t-19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45t45 19h320v768l-632 632q-43 43 -43 78q0 23 18 36.5t38 17.5t43 4h1408q23 0 43 -4t38 -17.5t18 -36.5z" />
+<glyph unicode="&#xf001;" d="M1536 1312v-1120q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v537l-768 -237v-709q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89 t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v967q0 31 19 56.5t49 35.5l832 256q12 4 28 4q40 0 68 -28t28 -68z" />
+<glyph unicode="&#xf002;" horiz-adv-x="1664" d="M1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -52 -38 -90t-90 -38q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5 t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" />
+<glyph unicode="&#xf003;" horiz-adv-x="1792" d="M1664 32v768q-32 -36 -69 -66q-268 -206 -426 -338q-51 -43 -83 -67t-86.5 -48.5t-102.5 -24.5h-1h-1q-48 0 -102.5 24.5t-86.5 48.5t-83 67q-158 132 -426 338q-37 30 -69 66v-768q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1664 1083v11v13.5t-0.5 13 t-3 12.5t-5.5 9t-9 7.5t-14 2.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5q0 -168 147 -284q193 -152 401 -317q6 -5 35 -29.5t46 -37.5t44.5 -31.5t50.5 -27.5t43 -9h1h1q20 0 43 9t50.5 27.5t44.5 31.5t46 37.5t35 29.5q208 165 401 317q54 43 100.5 115.5t46.5 131.5z M1792 1120v-1088q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
+<glyph unicode="&#xf004;" horiz-adv-x="1792" d="M896 -128q-26 0 -44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5q224 0 351 -124t127 -344q0 -221 -229 -450l-623 -600 q-18 -18 -44 -18z" />
+<glyph unicode="&#xf005;" horiz-adv-x="1664" d="M1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -21 -10.5 -35.5t-30.5 -14.5q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455 l502 -73q56 -9 56 -46z" />
+<glyph unicode="&#xf006;" horiz-adv-x="1664" d="M1137 532l306 297l-422 62l-189 382l-189 -382l-422 -62l306 -297l-73 -421l378 199l377 -199zM1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -50 -41 -50q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500 l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455l502 -73q56 -9 56 -46z" />
+<glyph unicode="&#xf007;" horiz-adv-x="1408" d="M1408 131q0 -120 -73 -189.5t-194 -69.5h-874q-121 0 -194 69.5t-73 189.5q0 53 3.5 103.5t14 109t26.5 108.5t43 97.5t62 81t85.5 53.5t111.5 20q9 0 42 -21.5t74.5 -48t108 -48t133.5 -21.5t133.5 21.5t108 48t74.5 48t42 21.5q61 0 111.5 -20t85.5 -53.5t62 -81 t43 -97.5t26.5 -108.5t14 -109t3.5 -103.5zM1088 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5z" />
+<glyph unicode="&#xf008;" horiz-adv-x="1920" d="M384 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 320v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 704v128q0 26 -19 45t-45 19h-128 q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1408 -64v512q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-512q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM384 1088v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45 t45 -19h128q26 0 45 19t19 45zM1792 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1408 704v512q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-512q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1792 320v128 q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1792 704v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t1
 9 45zM1792 1088v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19 t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1920 1248v-1344q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1344q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
+<glyph unicode="&#xf009;" horiz-adv-x="1664" d="M768 512v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM768 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 512v-384q0 -52 -38 -90t-90 -38 h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" />
+<glyph unicode="&#xf00a;" horiz-adv-x="1792" d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 288v-192q0 -40 -28 -68t-68 -28h-320 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28 h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 800v-192 q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28
 t28 -68z" />
+<glyph unicode="&#xf00b;" horiz-adv-x="1792" d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-960 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 800v-192q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v192q0 40 28 68t68 28 h960q40 0 68 -28t28 -68zM1792 1312v-192q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68z" />
+<glyph unicode="&#xf00c;" horiz-adv-x="1792" d="M1671 970q0 -40 -28 -68l-724 -724l-136 -136q-28 -28 -68 -28t-68 28l-136 136l-362 362q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -295l656 657q28 28 68 28t68 -28l136 -136q28 -28 28 -68z" />
+<glyph unicode="&#xf00d;" horiz-adv-x="1408" d="M1298 214q0 -40 -28 -68l-136 -136q-28 -28 -68 -28t-68 28l-294 294l-294 -294q-28 -28 -68 -28t-68 28l-136 136q-28 28 -28 68t28 68l294 294l-294 294q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -294l294 294q28 28 68 28t68 -28l136 -136q28 -28 28 -68 t-28 -68l-294 -294l294 -294q28 -28 28 -68z" />
+<glyph unicode="&#xf00e;" horiz-adv-x="1664" d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-224q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v224h-224q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h224v224q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5v-224h224 q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5 t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" />
+<glyph unicode="&#xf010;" horiz-adv-x="1664" d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-576q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h576q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5z M1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z " />
+<glyph unicode="&#xf011;" d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61t-298 61t-245 164t-164 245t-61 298q0 182 80.5 343t226.5 270q43 32 95.5 25t83.5 -50q32 -42 24.5 -94.5t-49.5 -84.5q-98 -74 -151.5 -181t-53.5 -228q0 -104 40.5 -198.5t109.5 -163.5t163.5 -109.5 t198.5 -40.5t198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5q0 121 -53.5 228t-151.5 181q-42 32 -49.5 84.5t24.5 94.5q31 43 84 50t95 -25q146 -109 226.5 -270t80.5 -343zM896 1408v-640q0 -52 -38 -90t-90 -38t-90 38t-38 90v640q0 52 38 90t90 38t90 -38t38 -90z" />
+<glyph unicode="&#xf012;" horiz-adv-x="1792" d="M256 96v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM640 224v-320q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1024 480v-576q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23 v576q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1408 864v-960q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 1376v-1472q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1472q0 14 9 23t23 9h192q14 0 23 -9t9 -23z" />
+<glyph unicode="&#xf013;" d="M1024 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1536 749v-222q0 -12 -8 -23t-20 -13l-185 -28q-19 -54 -39 -91q35 -50 107 -138q10 -12 10 -25t-9 -23q-27 -37 -99 -108t-94 -71q-12 0 -26 9l-138 108q-44 -23 -91 -38 q-16 -136 -29 -186q-7 -28 -36 -28h-222q-14 0 -24.5 8.5t-11.5 21.5l-28 184q-49 16 -90 37l-141 -107q-10 -9 -25 -9q-14 0 -25 11q-126 114 -165 168q-7 10 -7 23q0 12 8 23q15 21 51 66.5t54 70.5q-27 50 -41 99l-183 27q-13 2 -21 12.5t-8 23.5v222q0 12 8 23t19 13 l186 28q14 46 39 92q-40 57 -107 138q-10 12 -10 24q0 10 9 23q26 36 98.5 107.5t94.5 71.5q13 0 26 -10l138 -107q44 23 91 38q16 136 29 186q7 28 36 28h222q14 0 24.5 -8.5t11.5 -21.5l28 -184q49 -16 90 -37l142 107q9 9 24 9q13 0 25 -10q129 -119 165 -170q7 -8 7 -22 q0 -12 -8 -23q-15 -21 -51 -66.5t-54 -70.5q26 -50 41 -98l183 -28q13 -2 21 -12.5t8 -23.5z" />
+<glyph unicode="&#xf014;" horiz-adv-x="1408" d="M512 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM768 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1024 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576 q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1152 76v948h-896v-948q0 -22 7 -40.5t14.5 -27t10.5 -8.5h832q3 0 10.5 8.5t14.5 27t7 40.5zM480 1152h448l-48 117q-7 9 -17 11h-317q-10 -2 -17 -11zM1408 1120v-64q0 -14 -9 -23t-23 -9h-96v-948q0 -83 -47 -143.5t-113 -60.5h-832 q-66 0 -113 58.5t-47 141.5v952h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h309l70 167q15 37 54 63t79 26h320q40 0 79 -26t54 -63l70 -167h309q14 0 23 -9t9 -23z" />
+<glyph unicode="&#xf015;" horiz-adv-x="1664" d="M1408 544v-480q0 -26 -19 -45t-45 -19h-384v384h-256v-384h-384q-26 0 -45 19t-19 45v480q0 1 0.5 3t0.5 3l575 474l575 -474q1 -2 1 -6zM1631 613l-62 -74q-8 -9 -21 -11h-3q-13 0 -21 7l-692 577l-692 -577q-12 -8 -24 -7q-13 2 -21 11l-62 74q-8 10 -7 23.5t11 21.5 l719 599q32 26 76 26t76 -26l244 -204v195q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-408l219 -182q10 -8 11 -21.5t-7 -23.5z" />
+<glyph unicode="&#xf016;" horiz-adv-x="1280" d="M128 0h1024v768h-416q-40 0 -68 28t-28 68v416h-512v-1280zM768 896h376q-10 29 -22 41l-313 313q-12 12 -41 22v-376zM1280 864v-896q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h640q40 0 88 -20t76 -48l312 -312q28 -28 48 -76t20 -88z " />
+<glyph unicode="&#xf017;" d="M896 992v-448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf018;" horiz-adv-x="1920" d="M1111 540v4l-24 320q-1 13 -11 22.5t-23 9.5h-186q-13 0 -23 -9.5t-11 -22.5l-24 -320v-4q-1 -12 8 -20t21 -8h244q12 0 21 8t8 20zM1870 73q0 -73 -46 -73h-704q13 0 22 9.5t8 22.5l-20 256q-1 13 -11 22.5t-23 9.5h-272q-13 0 -23 -9.5t-11 -22.5l-20 -256 q-1 -13 8 -22.5t22 -9.5h-704q-46 0 -46 73q0 54 26 116l417 1044q8 19 26 33t38 14h339q-13 0 -23 -9.5t-11 -22.5l-15 -192q-1 -14 8 -23t22 -9h166q13 0 22 9t8 23l-15 192q-1 13 -11 22.5t-23 9.5h339q20 0 38 -14t26 -33l417 -1044q26 -62 26 -116z" />
+<glyph unicode="&#xf019;" horiz-adv-x="1664" d="M1280 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 416v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h465l135 -136 q58 -56 136 -56t136 56l136 136h464q40 0 68 -28t28 -68zM1339 985q17 -41 -14 -70l-448 -448q-18 -19 -45 -19t-45 19l-448 448q-31 29 -14 70q17 39 59 39h256v448q0 26 19 45t45 19h256q26 0 45 -19t19 -45v-448h256q42 0 59 -39z" />
+<glyph unicode="&#xf01a;" d="M1120 608q0 -12 -10 -24l-319 -319q-11 -9 -23 -9t-23 9l-320 320q-15 16 -7 35q8 20 30 20h192v352q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-352h192q14 0 23 -9t9 -23zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273 t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf01b;" d="M1118 660q-8 -20 -30 -20h-192v-352q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v352h-192q-14 0 -23 9t-9 23q0 12 10 24l319 319q11 9 23 9t23 -9l320 -320q15 -16 7 -35zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198 t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf01c;" d="M1023 576h316q-1 3 -2.5 8t-2.5 8l-212 496h-708l-212 -496q-1 -2 -2.5 -8t-2.5 -8h316l95 -192h320zM1536 546v-482q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v482q0 62 25 123l238 552q10 25 36.5 42t52.5 17h832q26 0 52.5 -17t36.5 -42l238 -552 q25 -61 25 -123z" />
+<glyph unicode="&#xf01d;" d="M1184 640q0 -37 -32 -55l-544 -320q-15 -9 -32 -9q-16 0 -32 8q-32 19 -32 56v640q0 37 32 56q33 18 64 -1l544 -320q32 -18 32 -55zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf01e;" d="M1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l138 138q-148 137 -349 137q-104 0 -198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5q119 0 225 52t179 147q7 10 23 12q14 0 25 -9 l137 -138q9 -8 9.5 -20.5t-7.5 -22.5q-109 -132 -264 -204.5t-327 -72.5q-156 0 -298 61t-245 164t-164 245t-61 298t61 298t164 245t245 164t298 61q147 0 284.5 -55.5t244.5 -156.5l130 129q29 31 70 14q39 -17 39 -59z" />
+<glyph unicode="&#xf021;" d="M1511 480q0 -5 -1 -7q-64 -268 -268 -434.5t-478 -166.5q-146 0 -282.5 55t-243.5 157l-129 -129q-19 -19 -45 -19t-45 19t-19 45v448q0 26 19 45t45 19h448q26 0 45 -19t19 -45t-19 -45l-137 -137q71 -66 161 -102t187 -36q134 0 250 65t186 179q11 17 53 117 q8 23 30 23h192q13 0 22.5 -9.5t9.5 -22.5zM1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-26 0 -45 19t-19 45t19 45l138 138q-148 137 -349 137q-134 0 -250 -65t-186 -179q-11 -17 -53 -117q-8 -23 -30 -23h-199q-13 0 -22.5 9.5t-9.5 22.5v7q65 268 270 434.5t480 166.5 q146 0 284 -55.5t245 -156.5l130 129q19 19 45 19t45 -19t19 -45z" />
+<glyph unicode="&#xf022;" horiz-adv-x="1792" d="M384 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M384 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1536 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5t9.5 -22.5z M1536 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5t9.5 -22.5zM1536 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5 t9.5 -22.5zM1664 160v832q0 13 -9.5 22.5t-22.5 9.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1792 1248v-1088q0 -66 -47 -113t-113 -47h-1472q-66 0 -1
 13 47t-47 113v1088q0 66 47 113t113 47h1472q66 0 113 -47 t47 -113z" />
+<glyph unicode="&#xf023;" horiz-adv-x="1152" d="M320 768h512v192q0 106 -75 181t-181 75t-181 -75t-75 -181v-192zM1152 672v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v192q0 184 132 316t316 132t316 -132t132 -316v-192h32q40 0 68 -28t28 -68z" />
+<glyph unicode="&#xf024;" horiz-adv-x="1792" d="M320 1280q0 -72 -64 -110v-1266q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v1266q-64 38 -64 110q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -25 -12.5 -38.5t-39.5 -27.5q-215 -116 -369 -116q-61 0 -123.5 22t-108.5 48 t-115.5 48t-142.5 22q-192 0 -464 -146q-17 -9 -33 -9q-26 0 -45 19t-19 45v742q0 32 31 55q21 14 79 43q236 120 421 120q107 0 200 -29t219 -88q38 -19 88 -19q54 0 117.5 21t110 47t88 47t54.5 21q26 0 45 -19t19 -45z" />
+<glyph unicode="&#xf025;" horiz-adv-x="1664" d="M1664 650q0 -166 -60 -314l-20 -49l-185 -33q-22 -83 -90.5 -136.5t-156.5 -53.5v-32q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-32q71 0 130 -35.5t93 -95.5l68 12q29 95 29 193q0 148 -88 279t-236.5 209t-315.5 78 t-315.5 -78t-236.5 -209t-88 -279q0 -98 29 -193l68 -12q34 60 93 95.5t130 35.5v32q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v32q-88 0 -156.5 53.5t-90.5 136.5l-185 33l-20 49q-60 148 -60 314q0 151 67 291t179 242.5 t266 163.5t320 61t320 -61t266 -163.5t179 -242.5t67 -291z" />
+<glyph unicode="&#xf026;" horiz-adv-x="768" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45z" />
+<glyph unicode="&#xf027;" horiz-adv-x="1152" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 35.5 t12 57t-12 57t-29 35.5t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142z" />
+<glyph unicode="&#xf028;" horiz-adv-x="1664" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 35.5 t12 57t-12 57t-29 35.5t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142zM1408 640q0 -153 -85 -282.5t-225 -188.5q-13 -5 -25 -5q-27 0 -46 19t-19 45q0 39 39 59q56 29 76 44q74 54 115.5 135.5t41.5 173.5t-41.5 173.5 t-115.5 135.5q-20 15 -76 44q-39 20 -39 59q0 26 19 45t45 19q13 0 26 -5q140 -59 225 -188.5t85 -282.5zM1664 640q0 -230 -127 -422.5t-338 -283.5q-13 -5 -26 -5q-26 0 -45 19t-19 45q0 36 39 59q7 4 22.5 10.5t22.5 10.5q46 25 82 51q123 91 192 227t69 289t-69 289 t-192 227q-36 26 -82 51q-7 4 -22.5 10.5t-22.5 10.5q-39 23 -39 59q0 26 19 45t45 19q13 0 26 -5q211 -91 338 -283.5t127 -422.5z" />
+<glyph unicode="&#xf029;" horiz-adv-x="1408" d="M384 384v-128h-128v128h128zM384 1152v-128h-128v128h128zM1152 1152v-128h-128v128h128zM128 129h384v383h-384v-383zM128 896h384v384h-384v-384zM896 896h384v384h-384v-384zM640 640v-640h-640v640h640zM1152 128v-128h-128v128h128zM1408 128v-128h-128v128h128z M1408 640v-384h-384v128h-128v-384h-128v640h384v-128h128v128h128zM640 1408v-640h-640v640h640zM1408 1408v-640h-640v640h640z" />
+<glyph unicode="&#xf02a;" horiz-adv-x="1792" d="M63 0h-63v1408h63v-1408zM126 1h-32v1407h32v-1407zM220 1h-31v1407h31v-1407zM377 1h-31v1407h31v-1407zM534 1h-62v1407h62v-1407zM660 1h-31v1407h31v-1407zM723 1h-31v1407h31v-1407zM786 1h-31v1407h31v-1407zM943 1h-63v1407h63v-1407zM1100 1h-63v1407h63v-1407z M1226 1h-63v1407h63v-1407zM1352 1h-63v1407h63v-1407zM1446 1h-63v1407h63v-1407zM1635 1h-94v1407h94v-1407zM1698 1h-32v1407h32v-1407zM1792 0h-63v1408h63v-1408z" />
+<glyph unicode="&#xf02b;" d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5 l715 -714q37 -39 37 -91z" />
+<glyph unicode="&#xf02c;" horiz-adv-x="1920" d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5 l715 -714q37 -39 37 -91zM1899 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-36 0 -59 14t-53 45l470 470q37 37 37 90q0 52 -37 91l-715 714q-38 38 -102 64.5t-117 26.5h224q53 0 117 -26.5t102 -64.5l715 -714q37 -39 37 -91z" />
+<glyph unicode="&#xf02d;" horiz-adv-x="1664" d="M1639 1058q40 -57 18 -129l-275 -906q-19 -64 -76.5 -107.5t-122.5 -43.5h-923q-77 0 -148.5 53.5t-99.5 131.5q-24 67 -2 127q0 4 3 27t4 37q1 8 -3 21.5t-3 19.5q2 11 8 21t16.5 23.5t16.5 23.5q23 38 45 91.5t30 91.5q3 10 0.5 30t-0.5 28q3 11 17 28t17 23 q21 36 42 92t25 90q1 9 -2.5 32t0.5 28q4 13 22 30.5t22 22.5q19 26 42.5 84.5t27.5 96.5q1 8 -3 25.5t-2 26.5q2 8 9 18t18 23t17 21q8 12 16.5 30.5t15 35t16 36t19.5 32t26.5 23.5t36 11.5t47.5 -5.5l-1 -3q38 9 51 9h761q74 0 114 -56t18 -130l-274 -906 q-36 -119 -71.5 -153.5t-128.5 -34.5h-869q-27 0 -38 -15q-11 -16 -1 -43q24 -70 144 -70h923q29 0 56 15.5t35 41.5l300 987q7 22 5 57q38 -15 59 -43zM575 1056q-4 -13 2 -22.5t20 -9.5h608q13 0 25.5 9.5t16.5 22.5l21 64q4 13 -2 22.5t-20 9.5h-608q-13 0 -25.5 -9.5 t-16.5 -22.5zM492 800q-4 -13 2 -22.5t20 -9.5h608q13 0 25.5 9.5t16.5 22.5l21 64q4 13 -2 22.5t-20 9.5h-608q-13 0 -25.5 -9.5t-16.5 -22.5z" />
+<glyph unicode="&#xf02e;" horiz-adv-x="1280" d="M1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289q0 34 19.5 62t52.5 41q21 9 44 9h1048z" />
+<glyph unicode="&#xf02f;" horiz-adv-x="1664" d="M384 0h896v256h-896v-256zM384 640h896v384h-160q-40 0 -68 28t-28 68v160h-640v-640zM1536 576q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 576v-416q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-160q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68 v160h-224q-13 0 -22.5 9.5t-9.5 22.5v416q0 79 56.5 135.5t135.5 56.5h64v544q0 40 28 68t68 28h672q40 0 88 -20t76 -48l152 -152q28 -28 48 -76t20 -88v-256h64q79 0 135.5 -56.5t56.5 -135.5z" />
+<glyph unicode="&#xf030;" horiz-adv-x="1920" d="M960 864q119 0 203.5 -84.5t84.5 -203.5t-84.5 -203.5t-203.5 -84.5t-203.5 84.5t-84.5 203.5t84.5 203.5t203.5 84.5zM1664 1280q106 0 181 -75t75 -181v-896q0 -106 -75 -181t-181 -75h-1408q-106 0 -181 75t-75 181v896q0 106 75 181t181 75h224l51 136 q19 49 69.5 84.5t103.5 35.5h512q53 0 103.5 -35.5t69.5 -84.5l51 -136h224zM960 128q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+<glyph unicode="&#xf031;" horiz-adv-x="1664" d="M725 977l-170 -450q73 -1 153.5 -2t119 -1.5t52.5 -0.5l29 2q-32 95 -92 241q-53 132 -92 211zM21 -128h-21l2 79q22 7 80 18q89 16 110 31q20 16 48 68l237 616l280 724h75h53l11 -21l205 -480q103 -242 124 -297q39 -102 96 -235q26 -58 65 -164q24 -67 65 -149 q22 -49 35 -57q22 -19 69 -23q47 -6 103 -27q6 -39 6 -57q0 -14 -1 -26q-80 0 -192 8q-93 8 -189 8q-79 0 -135 -2l-200 -11l-58 -2q0 45 4 78l131 28q56 13 68 23q12 12 12 27t-6 32l-47 114l-92 228l-450 2q-29 -65 -104 -274q-23 -64 -23 -84q0 -31 17 -43 q26 -21 103 -32q3 0 13.5 -2t30 -5t40.5 -6q1 -28 1 -58q0 -17 -2 -27q-66 0 -349 20l-48 -8q-81 -14 -167 -14z" />
+<glyph unicode="&#xf032;" horiz-adv-x="1408" d="M555 15q76 -32 140 -32q131 0 216 41t122 113q38 70 38 181q0 114 -41 180q-58 94 -141 126q-80 32 -247 32q-74 0 -101 -10v-144l-1 -173l3 -270q0 -15 12 -44zM541 761q43 -7 109 -7q175 0 264 65t89 224q0 112 -85 187q-84 75 -255 75q-52 0 -130 -13q0 -44 2 -77 q7 -122 6 -279l-1 -98q0 -43 1 -77zM0 -128l2 94q45 9 68 12q77 12 123 31q17 27 21 51q9 66 9 194l-2 497q-5 256 -9 404q-1 87 -11 109q-1 4 -12 12q-18 12 -69 15q-30 2 -114 13l-4 83l260 6l380 13l45 1q5 0 14 0.5t14 0.5q1 0 21.5 -0.5t40.5 -0.5h74q88 0 191 -27 q43 -13 96 -39q57 -29 102 -76q44 -47 65 -104t21 -122q0 -70 -32 -128t-95 -105q-26 -20 -150 -77q177 -41 267 -146q92 -106 92 -236q0 -76 -29 -161q-21 -62 -71 -117q-66 -72 -140 -108q-73 -36 -203 -60q-82 -15 -198 -11l-197 4q-84 2 -298 -11q-33 -3 -272 -11z" />
+<glyph unicode="&#xf033;" horiz-adv-x="1024" d="M0 -126l17 85q4 1 77 20q76 19 116 39q29 37 41 101l27 139l56 268l12 64q8 44 17 84.5t16 67t12.5 46.5t9 30.5t3.5 11.5l29 157l16 63l22 135l8 50v38q-41 22 -144 28q-28 2 -38 4l19 103l317 -14q39 -2 73 -2q66 0 214 9q33 2 68 4.5t36 2.5q-2 -19 -6 -38 q-7 -29 -13 -51q-55 -19 -109 -31q-64 -16 -101 -31q-12 -31 -24 -88q-9 -44 -13 -82q-44 -199 -66 -306l-61 -311l-38 -158l-43 -235l-12 -45q-2 -7 1 -27q64 -15 119 -21q36 -5 66 -10q-1 -29 -7 -58q-7 -31 -9 -41q-18 0 -23 -1q-24 -2 -42 -2q-9 0 -28 3q-19 4 -145 17 l-198 2q-41 1 -174 -11q-74 -7 -98 -9z" />
+<glyph unicode="&#xf034;" horiz-adv-x="1792" d="M81 1407l54 -27q20 -5 211 -5h130l19 3l115 1l215 -1h293l34 -2q14 -1 28 7t21 16l7 8l42 1q15 0 28 -1v-104.5t1 -131.5l1 -100l-1 -58q0 -32 -4 -51q-39 -15 -68 -18q-25 43 -54 128q-8 24 -15.5 62.5t-11.5 65.5t-6 29q-13 15 -27 19q-7 2 -42.5 2t-103.5 -1t-111 -1 q-34 0 -67 -5q-10 -97 -8 -136l1 -152v-332l3 -359l-1 -147q-1 -46 11 -85q49 -25 89 -32q2 0 18 -5t44 -13t43 -12q30 -8 50 -18q5 -45 5 -50q0 -10 -3 -29q-14 -1 -34 -1q-110 0 -187 10q-72 8 -238 8q-88 0 -233 -14q-48 -4 -70 -4q-2 22 -2 26l-1 26v9q21 33 79 49 q139 38 159 50q9 21 12 56q8 192 6 433l-5 428q-1 62 -0.5 118.5t0.5 102.5t-2 57t-6 15q-6 5 -14 6q-38 6 -148 6q-43 0 -100 -13.5t-73 -24.5q-13 -9 -22 -33t-22 -75t-24 -84q-6 -19 -19.5 -32t-20.5 -13q-44 27 -56 44v297v86zM1744 128q33 0 42 -18.5t-11 -44.5 l-126 -162q-20 -26 -49 -26t-49 26l-126 162q-20 26 -11 44.5t42 18.5h80v1024h-80q-33 0 -42 18.5t11 44.5l126 162q20 26 49 26t49 -26l126 -162q20 -26 11 -44.5t-42 -18.5h-80v-1024h80z" />
+<glyph unicode="&#xf035;" d="M81 1407l54 -27q20 -5 211 -5h130l19 3l115 1l446 -1h318l34 -2q14 -1 28 7t21 16l7 8l42 1q15 0 28 -1v-104.5t1 -131.5l1 -100l-1 -58q0 -32 -4 -51q-39 -15 -68 -18q-25 43 -54 128q-8 24 -15.5 62.5t-11.5 65.5t-6 29q-13 15 -27 19q-7 2 -58.5 2t-138.5 -1t-128 -1 q-94 0 -127 -5q-10 -97 -8 -136l1 -152v52l3 -359l-1 -147q-1 -46 11 -85q49 -25 89 -32q2 0 18 -5t44 -13t43 -12q30 -8 50 -18q5 -45 5 -50q0 -10 -3 -29q-14 -1 -34 -1q-110 0 -187 10q-72 8 -238 8q-82 0 -233 -13q-45 -5 -70 -5q-2 22 -2 26l-1 26v9q21 33 79 49 q139 38 159 50q9 21 12 56q6 137 6 433l-5 44q0 265 -2 278q-2 11 -6 15q-6 5 -14 6q-38 6 -148 6q-50 0 -168.5 -14t-132.5 -24q-13 -9 -22 -33t-22 -75t-24 -84q-6 -19 -19.5 -32t-20.5 -13q-44 27 -56 44v297v86zM1505 113q26 -20 26 -49t-26 -49l-162 -126 q-26 -20 -44.5 -11t-18.5 42v80h-1024v-80q0 -33 -18.5 -42t-44.5 11l-162 126q-26 20 -26 49t26 49l162 126q26 20 44.5 11t18.5 -42v-80h1024v80q0 33 18.5 42t44.5 -11z" />
+<glyph unicode="&#xf036;" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45 t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
+<glyph unicode="&#xf037;" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h896q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45t-45 -19 h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h640q26 0 45 -19t19 -45z" />
+<glyph unicode="&#xf038;" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45 t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
+<glyph unicode="&#xf039;" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45 t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" />
+<glyph unicode="&#xf03a;" horiz-adv-x="1792" d="M256 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM256 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5 t9.5 -22.5zM256 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1344 q13 0 22.5 -9.5t9.5 -22.5zM256 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5 t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t
 -22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192 q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5z" />
+<glyph unicode="&#xf03b;" horiz-adv-x="1792" d="M384 992v-576q0 -13 -9.5 -22.5t-22.5 -9.5q-14 0 -23 9l-288 288q-9 9 -9 23t9 23l288 288q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5 t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088 q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5t9.5 -22.5z" />
+<glyph unicode="&#xf03c;" horiz-adv-x="1792" d="M352 704q0 -14 -9 -23l-288 -288q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v576q0 13 9.5 22.5t22.5 9.5q14 0 23 -9l288 -288q9 -9 9 -23zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5 t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088 q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5t9.5 -22.5z" />
+<glyph unicode="&#xf03d;" horiz-adv-x="1792" d="M1792 1184v-1088q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-403 403v-166q0 -119 -84.5 -203.5t-203.5 -84.5h-704q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h704q119 0 203.5 -84.5t84.5 -203.5v-165l403 402q18 19 45 19q12 0 25 -5 q39 -17 39 -59z" />
+<glyph unicode="&#xf03e;" horiz-adv-x="1920" d="M640 960q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1664 576v-448h-1408v192l320 320l160 -160l512 512zM1760 1280h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-1216q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5v1216 q0 13 -9.5 22.5t-22.5 9.5zM1920 1248v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
+<glyph unicode="&#xf040;" d="M363 0l91 91l-235 235l-91 -91v-107h128v-128h107zM886 928q0 22 -22 22q-10 0 -17 -7l-542 -542q-7 -7 -7 -17q0 -22 22 -22q10 0 17 7l542 542q7 7 7 17zM832 1120l416 -416l-832 -832h-416v416zM1515 1024q0 -53 -37 -90l-166 -166l-416 416l166 165q36 38 90 38 q53 0 91 -38l235 -234q37 -39 37 -91z" />
+<glyph unicode="&#xf041;" horiz-adv-x="1024" d="M768 896q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1024 896q0 -109 -33 -179l-364 -774q-16 -33 -47.5 -52t-67.5 -19t-67.5 19t-46.5 52l-365 774q-33 70 -33 179q0 212 150 362t362 150t362 -150t150 -362z" />
+<glyph unicode="&#xf042;" d="M768 96v1088q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf043;" horiz-adv-x="1024" d="M512 384q0 36 -20 69q-1 1 -15.5 22.5t-25.5 38t-25 44t-21 50.5q-4 16 -21 16t-21 -16q-7 -23 -21 -50.5t-25 -44t-25.5 -38t-15.5 -22.5q-20 -33 -20 -69q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 512q0 -212 -150 -362t-362 -150t-362 150t-150 362 q0 145 81 275q6 9 62.5 90.5t101 151t99.5 178t83 201.5q9 30 34 47t51 17t51.5 -17t33.5 -47q28 -93 83 -201.5t99.5 -178t101 -151t62.5 -90.5q81 -127 81 -275z" />
+<glyph unicode="&#xf044;" horiz-adv-x="1792" d="M888 352l116 116l-152 152l-116 -116v-56h96v-96h56zM1328 1072q-16 16 -33 -1l-350 -350q-17 -17 -1 -33t33 1l350 350q17 17 1 33zM1408 478v-190q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832 q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-14 -14 -32 -8q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v126q0 13 9 22l64 64q15 15 35 7t20 -29zM1312 1216l288 -288l-672 -672h-288v288zM1756 1084l-92 -92 l-288 288l92 92q28 28 68 28t68 -28l152 -152q28 -28 28 -68t-28 -68z" />
+<glyph unicode="&#xf045;" horiz-adv-x="1664" d="M1408 547v-259q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h255v0q13 0 22.5 -9.5t9.5 -22.5q0 -27 -26 -32q-77 -26 -133 -60q-10 -4 -16 -4h-112q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832 q66 0 113 47t47 113v214q0 19 18 29q28 13 54 37q16 16 35 8q21 -9 21 -29zM1645 1043l-384 -384q-18 -19 -45 -19q-12 0 -25 5q-39 17 -39 59v192h-160q-323 0 -438 -131q-119 -137 -74 -473q3 -23 -20 -34q-8 -2 -12 -2q-16 0 -26 13q-10 14 -21 31t-39.5 68.5t-49.5 99.5 t-38.5 114t-17.5 122q0 49 3.5 91t14 90t28 88t47 81.5t68.5 74t94.5 61.5t124.5 48.5t159.5 30.5t196.5 11h160v192q0 42 39 59q13 5 25 5q26 0 45 -19l384 -384q19 -19 19 -45t-19 -45z" />
+<glyph unicode="&#xf046;" horiz-adv-x="1664" d="M1408 606v-318q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-10 -10 -23 -10q-3 0 -9 2q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832 q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v254q0 13 9 22l64 64q10 10 23 10q6 0 12 -3q20 -8 20 -29zM1639 1095l-814 -814q-24 -24 -57 -24t-57 24l-430 430q-24 24 -24 57t24 57l110 110q24 24 57 24t57 -24l263 -263l647 647q24 24 57 24t57 -24l110 -110 q24 -24 24 -57t-24 -57z" />
+<glyph unicode="&#xf047;" horiz-adv-x="1792" d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-384v-384h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v384h-384v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45 t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h384v384h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45t-19 -45t-45 -19h-128v-384h384v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" />
+<glyph unicode="&#xf048;" horiz-adv-x="1024" d="M979 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 11 13 19z" />
+<glyph unicode="&#xf049;" horiz-adv-x="1792" d="M1747 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 11 13 19l710 710 q19 19 32 13t13 -32v-710q4 11 13 19z" />
+<glyph unicode="&#xf04a;" horiz-adv-x="1664" d="M1619 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-8 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-19 19 -19 45t19 45l710 710q19 19 32 13t13 -32v-710q5 11 13 19z" />
+<glyph unicode="&#xf04b;" horiz-adv-x="1408" d="M1384 609l-1328 -738q-23 -13 -39.5 -3t-16.5 36v1472q0 26 16.5 36t39.5 -3l1328 -738q23 -13 23 -31t-23 -31z" />
+<glyph unicode="&#xf04c;" d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45zM640 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45z" />
+<glyph unicode="&#xf04d;" d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
+<glyph unicode="&#xf04e;" horiz-adv-x="1664" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v710q0 26 13 32t32 -13l710 -710q19 -19 19 -45t-19 -45l-710 -710q-19 -19 -32 -13t-13 32v710q-5 -10 -13 -19z" />
+<glyph unicode="&#xf050;" horiz-adv-x="1792" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v710q0 26 13 32t32 -13l710 -710q8 -8 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-5 -10 -13 -19l-710 -710 q-19 -19 -32 -13t-13 32v710q-5 -10 -13 -19z" />
+<glyph unicode="&#xf051;" horiz-adv-x="1024" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-5 -10 -13 -19z" />
+<glyph unicode="&#xf052;" horiz-adv-x="1538" d="M14 557l710 710q19 19 45 19t45 -19l710 -710q19 -19 13 -32t-32 -13h-1472q-26 0 -32 13t13 32zM1473 0h-1408q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1408q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19z" />
+<glyph unicode="&#xf053;" horiz-adv-x="1152" d="M742 -37l-652 651q-37 37 -37 90.5t37 90.5l652 651q37 37 90.5 37t90.5 -37l75 -75q37 -37 37 -90.5t-37 -90.5l-486 -486l486 -485q37 -38 37 -91t-37 -90l-75 -75q-37 -37 -90.5 -37t-90.5 37z" />
+<glyph unicode="&#xf054;" horiz-adv-x="1152" d="M1099 704q0 -52 -37 -91l-652 -651q-37 -37 -90 -37t-90 37l-76 75q-37 39 -37 91q0 53 37 90l486 486l-486 485q-37 39 -37 91q0 53 37 90l76 75q36 38 90 38t90 -38l652 -651q37 -37 37 -90z" />
+<glyph unicode="&#xf055;" d="M1216 576v128q0 26 -19 45t-45 19h-256v256q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-256h-256q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h256v-256q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v256h256q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5 t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf056;" d="M1216 576v128q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5 t103 -385.5z" />
+<glyph unicode="&#xf057;" d="M1149 414q0 26 -19 45l-181 181l181 181q19 19 19 45q0 27 -19 46l-90 90q-19 19 -46 19q-26 0 -45 -19l-181 -181l-181 181q-19 19 -45 19q-27 0 -46 -19l-90 -90q-19 -19 -19 -46q0 -26 19 -45l181 -181l-181 -181q-19 -19 -19 -45q0 -27 19 -46l90 -90q19 -19 46 -19 q26 0 45 19l181 181l181 -181q19 -19 45 -19q27 0 46 19l90 90q19 19 19 46zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf058;" d="M1284 802q0 28 -18 46l-91 90q-19 19 -45 19t-45 -19l-408 -407l-226 226q-19 19 -45 19t-45 -19l-91 -90q-18 -18 -18 -46q0 -27 18 -45l362 -362q19 -19 45 -19q27 0 46 19l543 543q18 18 18 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf059;" d="M896 160v192q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h192q14 0 23 9t9 23zM1152 832q0 88 -55.5 163t-138.5 116t-170 41q-243 0 -371 -213q-15 -24 8 -42l132 -100q7 -6 19 -6q16 0 25 12q53 68 86 92q34 24 86 24q48 0 85.5 -26t37.5 -59 q0 -38 -20 -61t-68 -45q-63 -28 -115.5 -86.5t-52.5 -125.5v-36q0 -14 9 -23t23 -9h192q14 0 23 9t9 23q0 19 21.5 49.5t54.5 49.5q32 18 49 28.5t46 35t44.5 48t28 60.5t12.5 81zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf05a;" d="M1024 160v160q0 14 -9 23t-23 9h-96v512q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h96v-320h-96q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h448q14 0 23 9t9 23zM896 1056v160q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23 t23 -9h192q14 0 23 9t9 23zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf05b;" d="M1197 512h-109q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h109q-32 108 -112.5 188.5t-188.5 112.5v-109q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v109q-108 -32 -188.5 -112.5t-112.5 -188.5h109q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-109 q32 -108 112.5 -188.5t188.5 -112.5v109q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-109q108 32 188.5 112.5t112.5 188.5zM1536 704v-128q0 -26 -19 -45t-45 -19h-143q-37 -161 -154.5 -278.5t-278.5 -154.5v-143q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v143 q-161 37 -278.5 154.5t-154.5 278.5h-143q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h143q37 161 154.5 278.5t278.5 154.5v143q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-143q161 -37 278.5 -154.5t154.5 -278.5h143q26 0 45 -19t19 -45z" />
+<glyph unicode="&#xf05c;" d="M1097 457l-146 -146q-10 -10 -23 -10t-23 10l-137 137l-137 -137q-10 -10 -23 -10t-23 10l-146 146q-10 10 -10 23t10 23l137 137l-137 137q-10 10 -10 23t10 23l146 146q10 10 23 10t23 -10l137 -137l137 137q10 10 23 10t23 -10l146 -146q10 -10 10 -23t-10 -23 l-137 -137l137 -137q10 -10 10 -23t-10 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5 t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf05d;" d="M1171 723l-422 -422q-19 -19 -45 -19t-45 19l-294 294q-19 19 -19 45t19 45l102 102q19 19 45 19t45 -19l147 -147l275 275q19 19 45 19t45 -19l102 -102q19 -19 19 -45t-19 -45zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198 t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf05e;" d="M1312 643q0 161 -87 295l-754 -753q137 -89 297 -89q111 0 211.5 43.5t173.5 116.5t116 174.5t43 212.5zM313 344l755 754q-135 91 -300 91q-148 0 -273 -73t-198 -199t-73 -274q0 -162 89 -299zM1536 643q0 -157 -61 -300t-163.5 -246t-245 -164t-298.5 -61t-298.5 61 t-245 164t-163.5 246t-61 300t61 299.5t163.5 245.5t245 164t298.5 61t298.5 -61t245 -164t163.5 -245.5t61 -299.5z" />
+<glyph unicode="&#xf060;" d="M1536 640v-128q0 -53 -32.5 -90.5t-84.5 -37.5h-704l293 -294q38 -36 38 -90t-38 -90l-75 -76q-37 -37 -90 -37q-52 0 -91 37l-651 652q-37 37 -37 90q0 52 37 91l651 650q38 38 91 38q52 0 90 -38l75 -74q38 -38 38 -91t-38 -91l-293 -293h704q52 0 84.5 -37.5 t32.5 -90.5z" />
+<glyph unicode="&#xf061;" d="M1472 576q0 -54 -37 -91l-651 -651q-39 -37 -91 -37q-51 0 -90 37l-75 75q-38 38 -38 91t38 91l293 293h-704q-52 0 -84.5 37.5t-32.5 90.5v128q0 53 32.5 90.5t84.5 37.5h704l-293 294q-38 36 -38 90t38 90l75 75q38 38 90 38q53 0 91 -38l651 -651q37 -35 37 -90z" />
+<glyph unicode="&#xf062;" horiz-adv-x="1664" d="M1611 565q0 -51 -37 -90l-75 -75q-38 -38 -91 -38q-54 0 -90 38l-294 293v-704q0 -52 -37.5 -84.5t-90.5 -32.5h-128q-53 0 -90.5 32.5t-37.5 84.5v704l-294 -293q-36 -38 -90 -38t-90 38l-75 75q-38 38 -38 90q0 53 38 91l651 651q35 37 90 37q54 0 91 -37l651 -651 q37 -39 37 -91z" />
+<glyph unicode="&#xf063;" horiz-adv-x="1664" d="M1611 704q0 -53 -37 -90l-651 -652q-39 -37 -91 -37q-53 0 -90 37l-651 652q-38 36 -38 90q0 53 38 91l74 75q39 37 91 37q53 0 90 -37l294 -294v704q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-704l294 294q37 37 90 37q52 0 91 -37l75 -75q37 -39 37 -91z" />
+<glyph unicode="&#xf064;" horiz-adv-x="1792" d="M1792 896q0 -26 -19 -45l-512 -512q-19 -19 -45 -19t-45 19t-19 45v256h-224q-98 0 -175.5 -6t-154 -21.5t-133 -42.5t-105.5 -69.5t-80 -101t-48.5 -138.5t-17.5 -181q0 -55 5 -123q0 -6 2.5 -23.5t2.5 -26.5q0 -15 -8.5 -25t-23.5 -10q-16 0 -28 17q-7 9 -13 22 t-13.5 30t-10.5 24q-127 285 -127 451q0 199 53 333q162 403 875 403h224v256q0 26 19 45t45 19t45 -19l512 -512q19 -19 19 -45z" />
+<glyph unicode="&#xf065;" d="M755 480q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23zM1536 1344v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332 q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45z" />
+<glyph unicode="&#xf066;" d="M768 576v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45zM1523 1248q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45 t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23z" />
+<glyph unicode="&#xf067;" horiz-adv-x="1408" d="M1408 800v-192q0 -40 -28 -68t-68 -28h-416v-416q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v416h-416q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h416v416q0 40 28 68t68 28h192q40 0 68 -28t28 -68v-416h416q40 0 68 -28t28 -68z" />
+<glyph unicode="&#xf068;" horiz-adv-x="1408" d="M1408 800v-192q0 -40 -28 -68t-68 -28h-1216q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h1216q40 0 68 -28t28 -68z" />
+<glyph unicode="&#xf069;" horiz-adv-x="1664" d="M1482 486q46 -26 59.5 -77.5t-12.5 -97.5l-64 -110q-26 -46 -77.5 -59.5t-97.5 12.5l-266 153v-307q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v307l-266 -153q-46 -26 -97.5 -12.5t-77.5 59.5l-64 110q-26 46 -12.5 97.5t59.5 77.5l266 154l-266 154 q-46 26 -59.5 77.5t12.5 97.5l64 110q26 46 77.5 59.5t97.5 -12.5l266 -153v307q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-307l266 153q46 26 97.5 12.5t77.5 -59.5l64 -110q26 -46 12.5 -97.5t-59.5 -77.5l-266 -154z" />
+<glyph unicode="&#xf06a;" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM896 161v190q0 14 -9 23.5t-22 9.5h-192q-13 0 -23 -10t-10 -23v-190q0 -13 10 -23t23 -10h192 q13 0 22 9.5t9 23.5zM894 505l18 621q0 12 -10 18q-10 8 -24 8h-220q-14 0 -24 -8q-10 -6 -10 -18l17 -621q0 -10 10 -17.5t24 -7.5h185q14 0 23.5 7.5t10.5 17.5z" />
+<glyph unicode="&#xf06b;" d="M928 180v56v468v192h-320v-192v-468v-56q0 -25 18 -38.5t46 -13.5h192q28 0 46 13.5t18 38.5zM472 1024h195l-126 161q-26 31 -69 31q-40 0 -68 -28t-28 -68t28 -68t68 -28zM1160 1120q0 40 -28 68t-68 28q-43 0 -69 -31l-125 -161h194q40 0 68 28t28 68zM1536 864v-320 q0 -14 -9 -23t-23 -9h-96v-416q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v416h-96q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h440q-93 0 -158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5q107 0 168 -77l128 -165l128 165q61 77 168 77q93 0 158.5 -65.5t65.5 -158.5 t-65.5 -158.5t-158.5 -65.5h440q14 0 23 -9t9 -23z" />
+<glyph unicode="&#xf06c;" horiz-adv-x="1792" d="M1280 832q0 26 -19 45t-45 19q-172 0 -318 -49.5t-259.5 -134t-235.5 -219.5q-19 -21 -19 -45q0 -26 19 -45t45 -19q24 0 45 19q27 24 74 71t67 66q137 124 268.5 176t313.5 52q26 0 45 19t19 45zM1792 1030q0 -95 -20 -193q-46 -224 -184.5 -383t-357.5 -268 q-214 -108 -438 -108q-148 0 -286 47q-15 5 -88 42t-96 37q-16 0 -39.5 -32t-45 -70t-52.5 -70t-60 -32q-30 0 -51 11t-31 24t-27 42q-2 4 -6 11t-5.5 10t-3 9.5t-1.5 13.5q0 35 31 73.5t68 65.5t68 56t31 48q0 4 -14 38t-16 44q-9 51 -9 104q0 115 43.5 220t119 184.5 t170.5 139t204 95.5q55 18 145 25.5t179.5 9t178.5 6t163.5 24t113.5 56.5l29.5 29.5t29.5 28t27 20t36.5 16t43.5 4.5q39 0 70.5 -46t47.5 -112t24 -124t8 -96z" />
+<glyph unicode="&#xf06d;" horiz-adv-x="1408" d="M1408 -160v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1152 896q0 -78 -24.5 -144t-64 -112.5t-87.5 -88t-96 -77.5t-87.5 -72t-64 -81.5t-24.5 -96.5q0 -96 67 -224l-4 1l1 -1 q-90 41 -160 83t-138.5 100t-113.5 122.5t-72.5 150.5t-27.5 184q0 78 24.5 144t64 112.5t87.5 88t96 77.5t87.5 72t64 81.5t24.5 96.5q0 94 -66 224l3 -1l-1 1q90 -41 160 -83t138.5 -100t113.5 -122.5t72.5 -150.5t27.5 -184z" />
+<glyph unicode="&#xf06e;" horiz-adv-x="1792" d="M1664 576q-152 236 -381 353q61 -104 61 -225q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 121 61 225q-229 -117 -381 -353q133 -205 333.5 -326.5t434.5 -121.5t434.5 121.5t333.5 326.5zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5 t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1792 576q0 -34 -20 -69q-140 -230 -376.5 -368.5t-499.5 -138.5t-499.5 139t-376.5 368q-20 35 -20 69t20 69q140 229 376.5 368t499.5 139t499.5 -139t376.5 -368q20 -35 20 -69z" />
+<glyph unicode="&#xf070;" horiz-adv-x="1792" d="M555 201l78 141q-87 63 -136 159t-49 203q0 121 61 225q-229 -117 -381 -353q167 -258 427 -375zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1307 1151q0 -7 -1 -9 q-105 -188 -315 -566t-316 -567l-49 -89q-10 -16 -28 -16q-12 0 -134 70q-16 10 -16 28q0 12 44 87q-143 65 -263.5 173t-208.5 245q-20 31 -20 69t20 69q153 235 380 371t496 136q89 0 180 -17l54 97q10 16 28 16q5 0 18 -6t31 -15.5t33 -18.5t31.5 -18.5t19.5 -11.5 q16 -10 16 -27zM1344 704q0 -139 -79 -253.5t-209 -164.5l280 502q8 -45 8 -84zM1792 576q0 -35 -20 -69q-39 -64 -109 -145q-150 -172 -347.5 -267t-419.5 -95l74 132q212 18 392.5 137t301.5 307q-115 179 -282 294l63 112q95 -64 182.5 -153t144.5 -184q20 -34 20 -69z " />
+<glyph unicode="&#xf071;" horiz-adv-x="1792" d="M1024 161v190q0 14 -9.5 23.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -23.5v-190q0 -14 9.5 -23.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 23.5zM1022 535l18 459q0 12 -10 19q-13 11 -24 11h-220q-11 0 -24 -11q-10 -7 -10 -21l17 -457q0 -10 10 -16.5t24 -6.5h185 q14 0 23.5 6.5t10.5 16.5zM1008 1469l768 -1408q35 -63 -2 -126q-17 -29 -46.5 -46t-63.5 -17h-1536q-34 0 -63.5 17t-46.5 46q-37 63 -2 126l768 1408q17 31 47 49t65 18t65 -18t47 -49z" />
+<glyph unicode="&#xf072;" horiz-adv-x="1408" d="M1376 1376q44 -52 12 -148t-108 -172l-161 -161l160 -696q5 -19 -12 -33l-128 -96q-7 -6 -19 -6q-4 0 -7 1q-15 3 -21 16l-279 508l-259 -259l53 -194q5 -17 -8 -31l-96 -96q-9 -9 -23 -9h-2q-15 2 -24 13l-189 252l-252 189q-11 7 -13 23q-1 13 9 25l96 97q9 9 23 9 q6 0 8 -1l194 -53l259 259l-508 279q-14 8 -17 24q-2 16 9 27l128 128q14 13 30 8l665 -159l160 160q76 76 172 108t148 -12z" />
+<glyph unicode="&#xf073;" horiz-adv-x="1664" d="M128 -128h288v288h-288v-288zM480 -128h320v288h-320v-288zM128 224h288v320h-288v-320zM480 224h320v320h-320v-320zM128 608h288v288h-288v-288zM864 -128h320v288h-320v-288zM480 608h320v288h-320v-288zM1248 -128h288v288h-288v-288zM864 224h320v320h-320v-320z M512 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1248 224h288v320h-288v-320zM864 608h320v288h-320v-288zM1248 608h288v288h-288v-288zM1280 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64 q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1664 1152v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47 h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
+<glyph unicode="&#xf074;" horiz-adv-x="1792" d="M666 1055q-60 -92 -137 -273q-22 45 -37 72.5t-40.5 63.5t-51 56.5t-63 35t-81.5 14.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q250 0 410 -225zM1792 256q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192q-32 0 -85 -0.5t-81 -1t-73 1 t-71 5t-64 10.5t-63 18.5t-58 28.5t-59 40t-55 53.5t-56 69.5q59 93 136 273q22 -45 37 -72.5t40.5 -63.5t51 -56.5t63 -35t81.5 -14.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23zM1792 1152q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5 v192h-256q-48 0 -87 -15t-69 -45t-51 -61.5t-45 -77.5q-32 -62 -78 -171q-29 -66 -49.5 -111t-54 -105t-64 -100t-74 -83t-90 -68.5t-106.5 -42t-128 -16.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q48 0 87 15t69 45t51 61.5t45 77.5q32 62 78 171q29 66 49.5 111 t54 105t64 100t74 83t90 68.5t106.5 42t128 16.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" />
+<glyph unicode="&#xf075;" horiz-adv-x="1792" d="M1792 640q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22q-17 -2 -30.5 9t-17.5 29v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281 q0 130 71 248.5t191 204.5t286 136.5t348 50.5q244 0 450 -85.5t326 -233t120 -321.5z" />
+<glyph unicode="&#xf076;" d="M1536 704v-128q0 -201 -98.5 -362t-274 -251.5t-395.5 -90.5t-395.5 90.5t-274 251.5t-98.5 362v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-128q0 -52 23.5 -90t53.5 -57t71 -30t64 -13t44 -2t44 2t64 13t71 30t53.5 57t23.5 90v128q0 26 19 45t45 19h384 q26 0 45 -19t19 -45zM512 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45zM1536 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45z" />
+<glyph unicode="&#xf077;" horiz-adv-x="1664" d="M1611 320q0 -53 -37 -90l-75 -75q-38 -38 -91 -38q-54 0 -90 38l-486 485l-486 -485q-36 -38 -90 -38t-90 38l-75 75q-38 36 -38 90q0 53 38 91l651 651q37 37 90 37q52 0 91 -37l650 -651q38 -38 38 -91z" />
+<glyph unicode="&#xf078;" horiz-adv-x="1664" d="M1611 832q0 -53 -37 -90l-651 -651q-38 -38 -91 -38q-54 0 -90 38l-651 651q-38 36 -38 90q0 53 38 91l74 75q39 37 91 37q53 0 90 -37l486 -486l486 486q37 37 90 37q52 0 91 -37l75 -75q37 -39 37 -91z" />
+<glyph unicode="&#xf079;" horiz-adv-x="1920" d="M1280 32q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-8 0 -13.5 2t-9 7t-5.5 8t-3 11.5t-1 11.5v13v11v160v416h-192q-26 0 -45 19t-19 45q0 24 15 41l320 384q19 22 49 22t49 -22l320 -384q15 -17 15 -41q0 -26 -19 -45t-45 -19h-192v-384h576q16 0 25 -11l160 -192q7 -11 7 -21 zM1920 448q0 -24 -15 -41l-320 -384q-20 -23 -49 -23t-49 23l-320 384q-15 17 -15 41q0 26 19 45t45 19h192v384h-576q-16 0 -25 12l-160 192q-7 9 -7 20q0 13 9.5 22.5t22.5 9.5h960q8 0 13.5 -2t9 -7t5.5 -8t3 -11.5t1 -11.5v-13v-11v-160v-416h192q26 0 45 -19t19 -45z " />
+<glyph unicode="&#xf07a;" horiz-adv-x="1664" d="M640 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1536 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1664 1088v-512q0 -24 -16 -42.5t-41 -21.5 l-1044 -122q1 -7 4.5 -21.5t6 -26.5t2.5 -22q0 -16 -24 -64h920q26 0 45 -19t19 -45t-19 -45t-45 -19h-1024q-26 0 -45 19t-19 45q0 14 11 39.5t29.5 59.5t20.5 38l-177 823h-204q-26 0 -45 19t-19 45t19 45t45 19h256q16 0 28.5 -6.5t20 -15.5t13 -24.5t7.5 -26.5 t5.5 -29.5t4.5 -25.5h1201q26 0 45 -19t19 -45z" />
+<glyph unicode="&#xf07b;" horiz-adv-x="1664" d="M1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />
+<glyph unicode="&#xf07c;" horiz-adv-x="1920" d="M1879 584q0 -31 -31 -66l-336 -396q-43 -51 -120.5 -86.5t-143.5 -35.5h-1088q-34 0 -60.5 13t-26.5 43q0 31 31 66l336 396q43 51 120.5 86.5t143.5 35.5h1088q34 0 60.5 -13t26.5 -43zM1536 928v-160h-832q-94 0 -197 -47.5t-164 -119.5l-337 -396l-5 -6q0 4 -0.5 12.5 t-0.5 12.5v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158z" />
+<glyph unicode="&#xf07d;" horiz-adv-x="768" d="M704 1216q0 -26 -19 -45t-45 -19h-128v-1024h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v1024h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45z" />
+<glyph unicode="&#xf07e;" horiz-adv-x="1792" d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-1024v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h1024v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" />
+<glyph unicode="&#xf080;" horiz-adv-x="1920" d="M512 512v-384h-256v384h256zM896 1024v-896h-256v896h256zM1280 768v-640h-256v640h256zM1664 1152v-1024h-256v1024h256zM1792 32v1216q0 13 -9.5 22.5t-22.5 9.5h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-1216q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5z M1920 1248v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
+<glyph unicode="&#xf081;" d="M1280 926q-56 -25 -121 -34q68 40 93 117q-65 -38 -134 -51q-61 66 -153 66q-87 0 -148.5 -61.5t-61.5 -148.5q0 -29 5 -48q-129 7 -242 65t-192 155q-29 -50 -29 -106q0 -114 91 -175q-47 1 -100 26v-2q0 -75 50 -133.5t123 -72.5q-29 -8 -51 -8q-13 0 -39 4 q21 -63 74.5 -104t121.5 -42q-116 -90 -261 -90q-26 0 -50 3q148 -94 322 -94q112 0 210 35.5t168 95t120.5 137t75 162t24.5 168.5q0 18 -1 27q63 45 105 109zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5 t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="&#xf082;" d="M1307 618l23 219h-198v109q0 49 15.5 68.5t71.5 19.5h110v219h-175q-152 0 -218 -72t-66 -213v-131h-131v-219h131v-635h262v635h175zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960 q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="&#xf083;" horiz-adv-x="1792" d="M928 704q0 14 -9 23t-23 9q-66 0 -113 -47t-47 -113q0 -14 9 -23t23 -9t23 9t9 23q0 40 28 68t68 28q14 0 23 9t9 23zM1152 574q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM128 0h1536v128h-1536v-128zM1280 574q0 159 -112.5 271.5 t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM256 1216h384v128h-384v-128zM128 1024h1536v118v138h-828l-64 -128h-644v-128zM1792 1280v-1280q0 -53 -37.5 -90.5t-90.5 -37.5h-1536q-53 0 -90.5 37.5t-37.5 90.5v1280 q0 53 37.5 90.5t90.5 37.5h1536q53 0 90.5 -37.5t37.5 -90.5z" />
+<glyph unicode="&#xf084;" horiz-adv-x="1792" d="M832 1024q0 80 -56 136t-136 56t-136 -56t-56 -136q0 -42 19 -83q-41 19 -83 19q-80 0 -136 -56t-56 -136t56 -136t136 -56t136 56t56 136q0 42 -19 83q41 -19 83 -19q80 0 136 56t56 136zM1683 320q0 -17 -49 -66t-66 -49q-9 0 -28.5 16t-36.5 33t-38.5 40t-24.5 26 l-96 -96l220 -220q28 -28 28 -68q0 -42 -39 -81t-81 -39q-40 0 -68 28l-671 671q-176 -131 -365 -131q-163 0 -265.5 102.5t-102.5 265.5q0 160 95 313t248 248t313 95q163 0 265.5 -102.5t102.5 -265.5q0 -189 -131 -365l355 -355l96 96q-3 3 -26 24.5t-40 38.5t-33 36.5 t-16 28.5q0 17 49 66t66 49q13 0 23 -10q6 -6 46 -44.5t82 -79.5t86.5 -86t73 -78t28.5 -41z" />
+<glyph unicode="&#xf085;" horiz-adv-x="1920" d="M896 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1664 128q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 1152q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5 t90.5 37.5t37.5 90.5zM1280 731v-185q0 -10 -7 -19.5t-16 -10.5l-155 -24q-11 -35 -32 -76q34 -48 90 -115q7 -10 7 -20q0 -12 -7 -19q-23 -30 -82.5 -89.5t-78.5 -59.5q-11 0 -21 7l-115 90q-37 -19 -77 -31q-11 -108 -23 -155q-7 -24 -30 -24h-186q-11 0 -20 7.5t-10 17.5 l-23 153q-34 10 -75 31l-118 -89q-7 -7 -20 -7q-11 0 -21 8q-144 133 -144 160q0 9 7 19q10 14 41 53t47 61q-23 44 -35 82l-152 24q-10 1 -17 9.5t-7 19.5v185q0 10 7 19.5t16 10.5l155 24q11 35 32 76q-34 48 -90 115q-7 11 -7 20q0 12 7 20q22 30 82 89t79 59q11 0 21 -7 l115 -90q34 18 77 32q11 108 23 154q7 24 30 24h186q11 0 20 -7.5t10 -17.5l23 -153q34 -10 75 -31l118 89q8 7 20 7q11 0 21 -8q144 -133 144 -160q0 -9 -7 -19q-12 -16 -42 -54t-45 -60q23 -48 34 -82l152 
 -23q10 -2 17 -10.5t7 -19.5zM1920 198v-140q0 -16 -149 -31 q-12 -27 -30 -52q51 -113 51 -138q0 -4 -4 -7q-122 -71 -124 -71q-8 0 -46 47t-52 68q-20 -2 -30 -2t-30 2q-14 -21 -52 -68t-46 -47q-2 0 -124 71q-4 3 -4 7q0 25 51 138q-18 25 -30 52q-149 15 -149 31v140q0 16 149 31q13 29 30 52q-51 113 -51 138q0 4 4 7q4 2 35 20 t59 34t30 16q8 0 46 -46.5t52 -67.5q20 2 30 2t30 -2q51 71 92 112l6 2q4 0 124 -70q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31zM1920 1222v-140q0 -16 -149 -31q-12 -27 -30 -52q51 -113 51 -138q0 -4 -4 -7q-122 -71 -124 -71q-8 0 -46 47t-52 68 q-20 -2 -30 -2t-30 2q-14 -21 -52 -68t-46 -47q-2 0 -124 71q-4 3 -4 7q0 25 51 138q-18 25 -30 52q-149 15 -149 31v140q0 16 149 31q13 29 30 52q-51 113 -51 138q0 4 4 7q4 2 35 20t59 34t30 16q8 0 46 -46.5t52 -67.5q20 2 30 2t30 -2q51 71 92 112l6 2q4 0 124 -70 q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31z" />
+<glyph unicode="&#xf086;" horiz-adv-x="1792" d="M1408 768q0 -139 -94 -257t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q-124 72 -195 177t-71 224 q0 139 94 257t256.5 186.5t353.5 68.5t353.5 -68.5t256.5 -186.5t94 -257zM1792 512q0 -120 -71 -224.5t-195 -176.5q10 -24 20.5 -44t25 -38.5t22.5 -29t26 -29.5t23 -25q1 -1 4 -4.5t4.5 -5t4 -5t3.5 -5.5l2.5 -5t2 -6t0.5 -6.5t-1 -6.5q-3 -14 -13 -22t-22 -7 q-50 7 -86 16q-154 40 -278 128q-90 -16 -176 -16q-271 0 -472 132q58 -4 88 -4q161 0 309 45t264 129q125 92 192 212t67 254q0 77 -23 152q129 -71 204 -178t75 -230z" />
+<glyph unicode="&#xf087;" d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 768q0 51 -39 89.5t-89 38.5h-352q0 58 48 159.5t48 160.5q0 98 -32 145t-128 47q-26 -26 -38 -85t-30.5 -125.5t-59.5 -109.5q-22 -23 -77 -91q-4 -5 -23 -30t-31.5 -41t-34.5 -42.5 t-40 -44t-38.5 -35.5t-40 -27t-35.5 -9h-32v-640h32q13 0 31.5 -3t33 -6.5t38 -11t35 -11.5t35.5 -12.5t29 -10.5q211 -73 342 -73h121q192 0 192 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5q32 1 53.5 47t21.5 81zM1536 769 q0 -89 -49 -163q9 -33 9 -69q0 -77 -38 -144q3 -21 3 -43q0 -101 -60 -178q1 -139 -85 -219.5t-227 -80.5h-36h-93q-96 0 -189.5 22.5t-216.5 65.5q-116 40 -138 40h-288q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5h274q36 24 137 155q58 75 107 128 q24 25 35.5 85.5t30.5 126.5t62 108q39 37 90 37q84 0 151 -32.5t102 -101.5t35 -186q0 -93 -48 -192h176q104 0 180 -76t76 -179z" />
+<glyph unicode="&#xf088;" d="M256 1088q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 512q0 35 -21.5 81t-53.5 47q15 17 25 47.5t10 55.5q0 69 -53 119q18 32 18 69t-17.5 73.5t-47.5 52.5q5 30 5 56q0 85 -49 126t-136 41h-128q-131 0 -342 -73q-5 -2 -29 -10.5 t-35.5 -12.5t-35 -11.5t-38 -11t-33 -6.5t-31.5 -3h-32v-640h32q16 0 35.5 -9t40 -27t38.5 -35.5t40 -44t34.5 -42.5t31.5 -41t23 -30q55 -68 77 -91q41 -43 59.5 -109.5t30.5 -125.5t38 -85q96 0 128 47t32 145q0 59 -48 160.5t-48 159.5h352q50 0 89 38.5t39 89.5z M1536 511q0 -103 -76 -179t-180 -76h-176q48 -99 48 -192q0 -118 -35 -186q-35 -69 -102 -101.5t-151 -32.5q-51 0 -90 37q-34 33 -54 82t-25.5 90.5t-17.5 84.5t-31 64q-48 50 -107 127q-101 131 -137 155h-274q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5 h288q22 0 138 40q128 44 223 66t200 22h112q140 0 226.5 -79t85.5 -216v-5q60 -77 60 -178q0 -22 -3 -43q38 -67 38 -144q0 -36 -9 -69q49 -74 49 -163z" />
+<glyph unicode="&#xf089;" horiz-adv-x="896" d="M832 1504v-1339l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41z" />
+<glyph unicode="&#xf08a;" horiz-adv-x="1792" d="M1664 940q0 81 -21.5 143t-55 98.5t-81.5 59.5t-94 31t-98 8t-112 -25.5t-110.5 -64t-86.5 -72t-60 -61.5q-18 -22 -49 -22t-49 22q-24 28 -60 61.5t-86.5 72t-110.5 64t-112 25.5t-98 -8t-94 -31t-81.5 -59.5t-55 -98.5t-21.5 -143q0 -168 187 -355l581 -560l580 559 q188 188 188 356zM1792 940q0 -221 -229 -450l-623 -600q-18 -18 -44 -18t-44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5 q224 0 351 -124t127 -344z" />
+<glyph unicode="&#xf08b;" horiz-adv-x="1664" d="M640 96q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h320q13 0 22.5 -9.5t9.5 -22.5q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-66 0 -113 -47t-47 -113v-704 q0 -66 47 -113t113 -47h288h11h13t11.5 -1t11.5 -3t8 -5.5t7 -9t2 -13.5zM1568 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45z" />
+<glyph unicode="&#xf08c;" d="M237 122h231v694h-231v-694zM483 1030q-1 52 -36 86t-93 34t-94.5 -34t-36.5 -86q0 -51 35.5 -85.5t92.5 -34.5h1q59 0 95 34.5t36 85.5zM1068 122h231v398q0 154 -73 233t-193 79q-136 0 -209 -117h2v101h-231q3 -66 0 -694h231v388q0 38 7 56q15 35 45 59.5t74 24.5 q116 0 116 -157v-371zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="&#xf08d;" horiz-adv-x="1152" d="M480 672v448q0 14 -9 23t-23 9t-23 -9t-9 -23v-448q0 -14 9 -23t23 -9t23 9t9 23zM1152 320q0 -26 -19 -45t-45 -19h-429l-51 -483q-2 -12 -10.5 -20.5t-20.5 -8.5h-1q-27 0 -32 27l-76 485h-404q-26 0 -45 19t-19 45q0 123 78.5 221.5t177.5 98.5v512q-52 0 -90 38 t-38 90t38 90t90 38h640q52 0 90 -38t38 -90t-38 -90t-90 -38v-512q99 0 177.5 -98.5t78.5 -221.5z" />
+<glyph unicode="&#xf08e;" horiz-adv-x="1792" d="M1408 608v-320q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h704q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v320 q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1792 1472v-512q0 -26 -19 -45t-45 -19t-45 19l-176 176l-652 -652q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l652 652l-176 176q-19 19 -19 45t19 45t45 19h512q26 0 45 -19t19 -45z" />
+<glyph unicode="&#xf090;" d="M1184 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45zM1536 992v-704q0 -119 -84.5 -203.5t-203.5 -84.5h-320q-13 0 -22.5 9.5t-9.5 22.5 q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q66 0 113 47t47 113v704q0 66 -47 113t-113 47h-288h-11h-13t-11.5 1t-11.5 3t-8 5.5t-7 9t-2 13.5q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="&#xf091;" horiz-adv-x="1664" d="M458 653q-74 162 -74 371h-256v-96q0 -78 94.5 -162t235.5 -113zM1536 928v96h-256q0 -209 -74 -371q141 29 235.5 113t94.5 162zM1664 1056v-128q0 -71 -41.5 -143t-112 -130t-173 -97.5t-215.5 -44.5q-42 -54 -95 -95q-38 -34 -52.5 -72.5t-14.5 -89.5q0 -54 30.5 -91 t97.5 -37q75 0 133.5 -45.5t58.5 -114.5v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 69 58.5 114.5t133.5 45.5q67 0 97.5 37t30.5 91q0 51 -14.5 89.5t-52.5 72.5q-53 41 -95 95q-113 5 -215.5 44.5t-173 97.5t-112 130t-41.5 143v128q0 40 28 68t68 28h288v96 q0 66 47 113t113 47h576q66 0 113 -47t47 -113v-96h288q40 0 68 -28t28 -68z" />
+<glyph unicode="&#xf092;" d="M394 184q-8 -9 -20 3q-13 11 -4 19q8 9 20 -3q12 -11 4 -19zM352 245q9 -12 0 -19q-8 -6 -17 7t0 18q9 7 17 -6zM291 305q-5 -7 -13 -2q-10 5 -7 12q3 5 13 2q10 -5 7 -12zM322 271q-6 -7 -16 3q-9 11 -2 16q6 6 16 -3q9 -11 2 -16zM451 159q-4 -12 -19 -6q-17 4 -13 15 t19 7q16 -5 13 -16zM514 154q0 -11 -16 -11q-17 -2 -17 11q0 11 16 11q17 2 17 -11zM572 164q2 -10 -14 -14t-18 8t14 15q16 2 18 -9zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-224q-16 0 -24.5 1t-19.5 5t-16 14.5t-5 27.5v239q0 97 -52 142q57 6 102.5 18t94 39 t81 66.5t53 105t20.5 150.5q0 121 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24q-93 26 -192 26t-192 -26q-16 11 -42.5 27t-83.5 38.5t-86 13.5q-44 -113 -7 -204q-79 -85 -79 -206q0 -85 20.5 -150t52.5 -105t80.5 -67t94 -39t102.5 -18q-40 -36 -49 -103 q-21 -10 -45 -15t-57 -5t-65.5 21.5t-55.5 62.5q-19 32 -48.5 52t-49.5 24l-20 3q-21 0 -29 -4.5t-5 -11.5t9 -14t13 -12l7 -5q22 -10 43.5 -38t31.5 -51l10 -23q13 -38 44 -61.5t67 -30t69.5 -7t55.5 3.5l23 4q0 -38 0.5 -103t0.5 
 -68q0 -22 -11 -33.5t-22 -13t-33 -1.5 h-224q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="&#xf093;" horiz-adv-x="1664" d="M1280 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 288v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h427q21 -56 70.5 -92 t110.5 -36h256q61 0 110.5 36t70.5 92h427q40 0 68 -28t28 -68zM1339 936q-17 -40 -59 -40h-256v-448q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v448h-256q-42 0 -59 40q-17 39 14 69l448 448q18 19 45 19t45 -19l448 -448q31 -30 14 -69z" />
+<glyph unicode="&#xf094;" d="M1407 710q0 44 -7 113.5t-18 96.5q-12 30 -17 44t-9 36.5t-4 48.5q0 23 5 68.5t5 67.5q0 37 -10 55q-4 1 -13 1q-19 0 -58 -4.5t-59 -4.5q-60 0 -176 24t-175 24q-43 0 -94.5 -11.5t-85 -23.5t-89.5 -34q-137 -54 -202 -103q-96 -73 -159.5 -189.5t-88 -236t-24.5 -248.5 q0 -40 12.5 -120t12.5 -121q0 -23 -11 -66.5t-11 -65.5t12 -36.5t34 -14.5q24 0 72.5 11t73.5 11q57 0 169.5 -15.5t169.5 -15.5q181 0 284 36q129 45 235.5 152.5t166 245.5t59.5 275zM1535 712q0 -165 -70 -327.5t-196 -288t-281 -180.5q-124 -44 -326 -44 q-57 0 -170 14.5t-169 14.5q-24 0 -72.5 -14.5t-73.5 -14.5q-73 0 -123.5 55.5t-50.5 128.5q0 24 11 68t11 67q0 40 -12.5 120.5t-12.5 121.5q0 111 18 217.5t54.5 209.5t100.5 194t150 156q78 59 232 120q194 78 316 78q60 0 175.5 -24t173.5 -24q19 0 57 5t58 5 q81 0 118 -50.5t37 -134.5q0 -23 -5 -68t-5 -68q0 -10 1 -18.5t3 -17t4 -13.5t6.5 -16t6.5 -17q16 -40 25 -118.5t9 -136.5z" />
+<glyph unicode="&#xf095;" horiz-adv-x="1408" d="M1408 296q0 -27 -10 -70.5t-21 -68.5q-21 -50 -122 -106q-94 -51 -186 -51q-27 0 -52.5 3.5t-57.5 12.5t-47.5 14.5t-55.5 20.5t-49 18q-98 35 -175 83q-128 79 -264.5 215.5t-215.5 264.5q-48 77 -83 175q-3 9 -18 49t-20.5 55.5t-14.5 47.5t-12.5 57.5t-3.5 52.5 q0 92 51 186q56 101 106 122q25 11 68.5 21t70.5 10q14 0 21 -3q18 -6 53 -76q11 -19 30 -54t35 -63.5t31 -53.5q3 -4 17.5 -25t21.5 -35.5t7 -28.5q0 -20 -28.5 -50t-62 -55t-62 -53t-28.5 -46q0 -9 5 -22.5t8.5 -20.5t14 -24t11.5 -19q76 -137 174 -235t235 -174 q2 -1 19 -11.5t24 -14t20.5 -8.5t22.5 -5q18 0 46 28.5t53 62t55 62t50 28.5q14 0 28.5 -7t35.5 -21.5t25 -17.5q25 -15 53.5 -31t63.5 -35t54 -30q70 -35 76 -53q3 -7 3 -21z" />
+<glyph unicode="&#xf096;" horiz-adv-x="1408" d="M1120 1280h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v832q0 66 -47 113t-113 47zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832 q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="&#xf097;" horiz-adv-x="1280" d="M1152 1280h-1024v-1242l423 406l89 85l89 -85l423 -406v1242zM1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289 q0 34 19.5 62t52.5 41q21 9 44 9h1048z" />
+<glyph unicode="&#xf098;" d="M1280 343q0 11 -2 16q-3 8 -38.5 29.5t-88.5 49.5l-53 29q-5 3 -19 13t-25 15t-21 5q-18 0 -47 -32.5t-57 -65.5t-44 -33q-7 0 -16.5 3.5t-15.5 6.5t-17 9.5t-14 8.5q-99 55 -170.5 126.5t-126.5 170.5q-2 3 -8.5 14t-9.5 17t-6.5 15.5t-3.5 16.5q0 13 20.5 33.5t45 38.5 t45 39.5t20.5 36.5q0 10 -5 21t-15 25t-13 19q-3 6 -15 28.5t-25 45.5t-26.5 47.5t-25 40.5t-16.5 18t-16 2q-48 0 -101 -22q-46 -21 -80 -94.5t-34 -130.5q0 -16 2.5 -34t5 -30.5t9 -33t10 -29.5t12.5 -33t11 -30q60 -164 216.5 -320.5t320.5 -216.5q6 -2 30 -11t33 -12.5 t29.5 -10t33 -9t30.5 -5t34 -2.5q57 0 130.5 34t94.5 80q22 53 22 101zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="&#xf099;" horiz-adv-x="1664" d="M1620 1128q-67 -98 -162 -167q1 -14 1 -42q0 -130 -38 -259.5t-115.5 -248.5t-184.5 -210.5t-258 -146t-323 -54.5q-271 0 -496 145q35 -4 78 -4q225 0 401 138q-105 2 -188 64.5t-114 159.5q33 -5 61 -5q43 0 85 11q-112 23 -185.5 111.5t-73.5 205.5v4q68 -38 146 -41 q-66 44 -105 115t-39 154q0 88 44 163q121 -149 294.5 -238.5t371.5 -99.5q-8 38 -8 74q0 134 94.5 228.5t228.5 94.5q140 0 236 -102q109 21 205 78q-37 -115 -142 -178q93 10 186 50z" />
+<glyph unicode="&#xf09a;" horiz-adv-x="768" d="M511 980h257l-30 -284h-227v-824h-341v824h-170v284h170v171q0 182 86 275.5t283 93.5h227v-284h-142q-39 0 -62.5 -6.5t-34 -23.5t-13.5 -34.5t-3 -49.5v-142z" />
+<glyph unicode="&#xf09b;" d="M1536 640q0 -251 -146.5 -451.5t-378.5 -277.5q-27 -5 -39.5 7t-12.5 30v211q0 97 -52 142q57 6 102.5 18t94 39t81 66.5t53 105t20.5 150.5q0 121 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24q-93 26 -192 26t-192 -26q-16 11 -42.5 27t-83.5 38.5t-86 13.5 q-44 -113 -7 -204q-79 -85 -79 -206q0 -85 20.5 -150t52.5 -105t80.5 -67t94 -39t102.5 -18q-40 -36 -49 -103q-21 -10 -45 -15t-57 -5t-65.5 21.5t-55.5 62.5q-19 32 -48.5 52t-49.5 24l-20 3q-21 0 -29 -4.5t-5 -11.5t9 -14t13 -12l7 -5q22 -10 43.5 -38t31.5 -51l10 -23 q13 -38 44 -61.5t67 -30t69.5 -7t55.5 3.5l23 4q0 -38 0.5 -89t0.5 -54q0 -18 -13 -30t-40 -7q-232 77 -378.5 277.5t-146.5 451.5q0 209 103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf09c;" horiz-adv-x="1664" d="M1664 960v-256q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45v256q0 106 -75 181t-181 75t-181 -75t-75 -181v-192h96q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h672v192q0 185 131.5 316.5t316.5 131.5 t316.5 -131.5t131.5 -316.5z" />
+<glyph unicode="&#xf09d;" horiz-adv-x="1920" d="M1760 1408q66 0 113 -47t47 -113v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600zM160 1280q-13 0 -22.5 -9.5t-9.5 -22.5v-224h1664v224q0 13 -9.5 22.5t-22.5 9.5h-1600zM1760 0q13 0 22.5 9.5t9.5 22.5v608h-1664v-608 q0 -13 9.5 -22.5t22.5 -9.5h1600zM256 128v128h256v-128h-256zM640 128v128h384v-128h-384z" />
+<glyph unicode="&#xf09e;" horiz-adv-x="1408" d="M384 192q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 69q2 -28 -17 -48q-18 -21 -47 -21h-135q-25 0 -43 16.5t-20 41.5q-22 229 -184.5 391.5t-391.5 184.5q-25 2 -41.5 20t-16.5 43v135q0 29 21 47q17 17 43 17h5q160 -13 306 -80.5 t259 -181.5q114 -113 181.5 -259t80.5 -306zM1408 67q2 -27 -18 -47q-18 -20 -46 -20h-143q-26 0 -44.5 17.5t-19.5 42.5q-12 215 -101 408.5t-231.5 336t-336 231.5t-408.5 102q-25 1 -42.5 19.5t-17.5 43.5v143q0 28 20 46q18 18 44 18h3q262 -13 501.5 -120t425.5 -294 q187 -186 294 -425.5t120 -501.5z" />
+<glyph unicode="&#xf0a0;" d="M1040 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1296 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1408 160v320q0 13 -9.5 22.5t-22.5 9.5 h-1216q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h1216q13 0 22.5 9.5t9.5 22.5zM178 640h1180l-157 482q-4 13 -16 21.5t-26 8.5h-782q-14 0 -26 -8.5t-16 -21.5zM1536 480v-320q0 -66 -47 -113t-113 -47h-1216q-66 0 -113 47t-47 113v320q0 25 16 75 l197 606q17 53 63 86t101 33h782q55 0 101 -33t63 -86l197 -606q16 -50 16 -75z" />
+<glyph unicode="&#xf0a1;" horiz-adv-x="1792" d="M1664 896q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5v-384q0 -52 -38 -90t-90 -38q-417 347 -812 380q-58 -19 -91 -66t-31 -100.5t40 -92.5q-20 -33 -23 -65.5t6 -58t33.5 -55t48 -50t61.5 -50.5q-29 -58 -111.5 -83t-168.5 -11.5t-132 55.5q-7 23 -29.5 87.5 t-32 94.5t-23 89t-15 101t3.5 98.5t22 110.5h-122q-66 0 -113 47t-47 113v192q0 66 47 113t113 47h480q435 0 896 384q52 0 90 -38t38 -90v-384zM1536 292v954q-394 -302 -768 -343v-270q377 -42 768 -341z" />
+<glyph unicode="&#xf0a2;" horiz-adv-x="1664" d="M848 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM183 128h1298q-164 181 -246.5 411.5t-82.5 484.5q0 256 -320 256t-320 -256q0 -254 -82.5 -484.5t-246.5 -411.5zM1664 128q0 -52 -38 -90t-90 -38 h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q190 161 287 397.5t97 498.5q0 165 96 262t264 117q-8 18 -8 37q0 40 28 68t68 28t68 -28t28 -68q0 -19 -8 -37q168 -20 264 -117t96 -262q0 -262 97 -498.5t287 -397.5z" />
+<glyph unicode="&#xf0a3;" d="M1376 640l138 -135q30 -28 20 -70q-12 -41 -52 -51l-188 -48l53 -186q12 -41 -19 -70q-29 -31 -70 -19l-186 53l-48 -188q-10 -40 -51 -52q-12 -2 -19 -2q-31 0 -51 22l-135 138l-135 -138q-28 -30 -70 -20q-41 11 -51 52l-48 188l-186 -53q-41 -12 -70 19q-31 29 -19 70 l53 186l-188 48q-40 10 -52 51q-10 42 20 70l138 135l-138 135q-30 28 -20 70q12 41 52 51l188 48l-53 186q-12 41 19 70q29 31 70 19l186 -53l48 188q10 41 51 51q41 12 70 -19l135 -139l135 139q29 30 70 19q41 -10 51 -51l48 -188l186 53q41 12 70 -19q31 -29 19 -70 l-53 -186l188 -48q40 -10 52 -51q10 -42 -20 -70z" />
+<glyph unicode="&#xf0a4;" horiz-adv-x="1792" d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 768q0 51 -39 89.5t-89 38.5h-576q0 20 15 48.5t33 55t33 68t15 84.5q0 67 -44.5 97.5t-115.5 30.5q-24 0 -90 -139q-24 -44 -37 -65q-40 -64 -112 -145q-71 -81 -101 -106 q-69 -57 -140 -57h-32v-640h32q72 0 167 -32t193.5 -64t179.5 -32q189 0 189 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5h331q52 0 90 38t38 90zM1792 769q0 -105 -75.5 -181t-180.5 -76h-169q-4 -62 -37 -119q3 -21 3 -43 q0 -101 -60 -178q1 -139 -85 -219.5t-227 -80.5q-133 0 -322 69q-164 59 -223 59h-288q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5h288q10 0 21.5 4.5t23.5 14t22.5 18t24 22.5t20.5 21.5t19 21.5t14 17q65 74 100 129q13 21 33 62t37 72t40.5 63t55 49.5 t69.5 17.5q125 0 206.5 -67t81.5 -189q0 -68 -22 -128h374q104 0 180 -76t76 -179z" />
+<glyph unicode="&#xf0a5;" horiz-adv-x="1792" d="M1376 128h32v640h-32q-35 0 -67.5 12t-62.5 37t-50 46t-49 54q-2 3 -3.5 4.5t-4 4.5t-4.5 5q-72 81 -112 145q-14 22 -38 68q-1 3 -10.5 22.5t-18.5 36t-20 35.5t-21.5 30.5t-18.5 11.5q-71 0 -115.5 -30.5t-44.5 -97.5q0 -43 15 -84.5t33 -68t33 -55t15 -48.5h-576 q-50 0 -89 -38.5t-39 -89.5q0 -52 38 -90t90 -38h331q-15 -17 -25 -47.5t-10 -55.5q0 -69 53 -119q-18 -32 -18 -69t17.5 -73.5t47.5 -52.5q-4 -24 -4 -56q0 -85 48.5 -126t135.5 -41q84 0 183 32t194 64t167 32zM1664 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45 t45 -19t45 19t19 45zM1792 768v-640q0 -53 -37.5 -90.5t-90.5 -37.5h-288q-59 0 -223 -59q-190 -69 -317 -69q-142 0 -230 77.5t-87 217.5l1 5q-61 76 -61 178q0 22 3 43q-33 57 -37 119h-169q-105 0 -180.5 76t-75.5 181q0 103 76 179t180 76h374q-22 60 -22 128 q0 122 81.5 189t206.5 67q38 0 69.5 -17.5t55 -49.5t40.5 -63t37 -72t33 -62q35 -55 100 -129q2 -3 14 -17t19 -21.5t20.5 -21.5t24 -22.5t22.5 -18t23.5 -14t21.5 -4.5h288q53 0 90.5 -37.5t37.5 -90.5z" />
+<glyph unicode="&#xf0a6;" d="M1280 -64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 700q0 189 -167 189q-26 0 -56 -5q-16 30 -52.5 47.5t-73.5 17.5t-69 -18q-50 53 -119 53q-25 0 -55.5 -10t-47.5 -25v331q0 52 -38 90t-90 38q-51 0 -89.5 -39t-38.5 -89v-576 q-20 0 -48.5 15t-55 33t-68 33t-84.5 15q-67 0 -97.5 -44.5t-30.5 -115.5q0 -24 139 -90q44 -24 65 -37q64 -40 145 -112q81 -71 106 -101q57 -69 57 -140v-32h640v32q0 72 32 167t64 193.5t32 179.5zM1536 705q0 -133 -69 -322q-59 -164 -59 -223v-288q0 -53 -37.5 -90.5 t-90.5 -37.5h-640q-53 0 -90.5 37.5t-37.5 90.5v288q0 10 -4.5 21.5t-14 23.5t-18 22.5t-22.5 24t-21.5 20.5t-21.5 19t-17 14q-74 65 -129 100q-21 13 -62 33t-72 37t-63 40.5t-49.5 55t-17.5 69.5q0 125 67 206.5t189 81.5q68 0 128 -22v374q0 104 76 180t179 76 q105 0 181 -75.5t76 -180.5v-169q62 -4 119 -37q21 3 43 3q101 0 178 -60q139 1 219.5 -85t80.5 -227z" />
+<glyph unicode="&#xf0a7;" d="M1408 576q0 84 -32 183t-64 194t-32 167v32h-640v-32q0 -35 -12 -67.5t-37 -62.5t-46 -50t-54 -49q-9 -8 -14 -12q-81 -72 -145 -112q-22 -14 -68 -38q-3 -1 -22.5 -10.5t-36 -18.5t-35.5 -20t-30.5 -21.5t-11.5 -18.5q0 -71 30.5 -115.5t97.5 -44.5q43 0 84.5 15t68 33 t55 33t48.5 15v-576q0 -50 38.5 -89t89.5 -39q52 0 90 38t38 90v331q46 -35 103 -35q69 0 119 53q32 -18 69 -18t73.5 17.5t52.5 47.5q24 -4 56 -4q85 0 126 48.5t41 135.5zM1280 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 580 q0 -142 -77.5 -230t-217.5 -87l-5 1q-76 -61 -178 -61q-22 0 -43 3q-54 -30 -119 -37v-169q0 -105 -76 -180.5t-181 -75.5q-103 0 -179 76t-76 180v374q-54 -22 -128 -22q-121 0 -188.5 81.5t-67.5 206.5q0 38 17.5 69.5t49.5 55t63 40.5t72 37t62 33q55 35 129 100 q3 2 17 14t21.5 19t21.5 20.5t22.5 24t18 22.5t14 23.5t4.5 21.5v288q0 53 37.5 90.5t90.5 37.5h640q53 0 90.5 -37.5t37.5 -90.5v-288q0 -59 59 -223q69 -190 69 -317z" />
+<glyph unicode="&#xf0a8;" d="M1280 576v128q0 26 -19 45t-45 19h-502l189 189q19 19 19 45t-19 45l-91 91q-18 18 -45 18t-45 -18l-362 -362l-91 -91q-18 -18 -18 -45t18 -45l91 -91l362 -362q18 -18 45 -18t45 18l91 91q18 18 18 45t-18 45l-189 189h502q26 0 45 19t19 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf0a9;" d="M1285 640q0 27 -18 45l-91 91l-362 362q-18 18 -45 18t-45 -18l-91 -91q-18 -18 -18 -45t18 -45l189 -189h-502q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h502l-189 -189q-19 -19 -19 -45t19 -45l91 -91q18 -18 45 -18t45 18l362 362l91 91q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf0aa;" d="M1284 641q0 27 -18 45l-362 362l-91 91q-18 18 -45 18t-45 -18l-91 -91l-362 -362q-18 -18 -18 -45t18 -45l91 -91q18 -18 45 -18t45 18l189 189v-502q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v502l189 -189q19 -19 45 -19t45 19l91 91q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf0ab;" d="M1284 639q0 27 -18 45l-91 91q-18 18 -45 18t-45 -18l-189 -189v502q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-502l-189 189q-19 19 -45 19t-45 -19l-91 -91q-18 -18 -18 -45t18 -45l362 -362l91 -91q18 -18 45 -18t45 18l91 91l362 362q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf0ac;" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1042 887q-2 -1 -9.5 -9.5t-13.5 -9.5q2 0 4.5 5t5 11t3.5 7q6 7 22 15q14 6 52 12q34 8 51 -11 q-2 2 9.5 13t14.5 12q3 2 15 4.5t15 7.5l2 22q-12 -1 -17.5 7t-6.5 21q0 -2 -6 -8q0 7 -4.5 8t-11.5 -1t-9 -1q-10 3 -15 7.5t-8 16.5t-4 15q-2 5 -9.5 10.5t-9.5 10.5q-1 2 -2.5 5.5t-3 6.5t-4 5.5t-5.5 2.5t-7 -5t-7.5 -10t-4.5 -5q-3 2 -6 1.5t-4.5 -1t-4.5 -3t-5 -3.5 q-3 -2 -8.5 -3t-8.5 -2q15 5 -1 11q-10 4 -16 3q9 4 7.5 12t-8.5 14h5q-1 4 -8.5 8.5t-17.5 8.5t-13 6q-8 5 -34 9.5t-33 0.5q-5 -6 -4.5 -10.5t4 -14t3.5 -12.5q1 -6 -5.5 -13t-6.5 -12q0 -7 14 -15.5t10 -21.5q-3 -8 -16 -16t-16 -12q-5 -8 -1.5 -18.5t10.5 -16.5 q2 -2 1.5 -4t-3.5 -4.5t-5.5 -4t-6.5 -3.5l-3 -2q-11 -5 -20.5 6t-13.5 26q-7 25 -16 30q-23 8 -29 -1q-5 13 -41 26q-25 9 -58 4q6 1 0 15q-7 15 -19 12q3 6 4 17.5t1 13.5q3 13 12 23q1 1 7 8.5t9.5 13.5t0.5 6q35 -4 50 11q5 5 11.5 17
 t10.5 17q9 6 14 5.5t14.5 -5.5 t14.5 -5q14 -1 15.5 11t-7.5 20q12 -1 3 17q-5 7 -8 9q-12 4 -27 -5q-8 -4 2 -8q-1 1 -9.5 -10.5t-16.5 -17.5t-16 5q-1 1 -5.5 13.5t-9.5 13.5q-8 0 -16 -15q3 8 -11 15t-24 8q19 12 -8 27q-7 4 -20.5 5t-19.5 -4q-5 -7 -5.5 -11.5t5 -8t10.5 -5.5t11.5 -4t8.5 -3 q14 -10 8 -14q-2 -1 -8.5 -3.5t-11.5 -4.5t-6 -4q-3 -4 0 -14t-2 -14q-5 5 -9 17.5t-7 16.5q7 -9 -25 -6l-10 1q-4 0 -16 -2t-20.5 -1t-13.5 8q-4 8 0 20q1 4 4 2q-4 3 -11 9.5t-10 8.5q-46 -15 -94 -41q6 -1 12 1q5 2 13 6.5t10 5.5q34 14 42 7l5 5q14 -16 20 -25 q-7 4 -30 1q-20 -6 -22 -12q7 -12 5 -18q-4 3 -11.5 10t-14.5 11t-15 5q-16 0 -22 -1q-146 -80 -235 -222q7 -7 12 -8q4 -1 5 -9t2.5 -11t11.5 3q9 -8 3 -19q1 1 44 -27q19 -17 21 -21q3 -11 -10 -18q-1 2 -9 9t-9 4q-3 -5 0.5 -18.5t10.5 -12.5q-7 0 -9.5 -16t-2.5 -35.5 t-1 -23.5l2 -1q-3 -12 5.5 -34.5t21.5 -19.5q-13 -3 20 -43q6 -8 8 -9q3 -2 12 -7.5t15 -10t10 -10.5q4 -5 10 -22.5t14 -23.5q-2 -6 9.5 -20t10.5 -23q-1 0 -2.5 -1t-2.5 -1q3 -7 15.5 -14t15.5 -13q1 -3 2 -10t3 -11t8 -2q2 20 -24 62q-1
 5 25 -17 29q-3 5 -5.5 15.5 t-4.5 14.5q2 0 6 -1.5t8.5 -3.5t7.5 -4t2 -3q-3 -7 2 -17.5t12 -18.5t17 -19t12 -13q6 -6 14 -19.5t0 -13.5q9 0 20 -10t17 -20q5 -8 8 -26t5 -24q2 -7 8.5 -13.5t12.5 -9.5l16 -8t13 -7q5 -2 18.5 -10.5t21.5 -11.5q10 -4 16 -4t14.5 2.5t13.5 3.5q15 2 29 -15t21 -21 q36 -19 55 -11q-2 -1 0.5 -7.5t8 -15.5t9 -14.5t5.5 -8.5q5 -6 18 -15t18 -15q6 4 7 9q-3 -8 7 -20t18 -10q14 3 14 32q-31 -15 -49 18q0 1 -2.5 5.5t-4 8.5t-2.5 8.5t0 7.5t5 3q9 0 10 3.5t-2 12.5t-4 13q-1 8 -11 20t-12 15q-5 -9 -16 -8t-16 9q0 -1 -1.5 -5.5t-1.5 -6.5 q-13 0 -15 1q1 3 2.5 17.5t3.5 22.5q1 4 5.5 12t7.5 14.5t4 12.5t-4.5 9.5t-17.5 2.5q-19 -1 -26 -20q-1 -3 -3 -10.5t-5 -11.5t-9 -7q-7 -3 -24 -2t-24 5q-13 8 -22.5 29t-9.5 37q0 10 2.5 26.5t3 25t-5.5 24.5q3 2 9 9.5t10 10.5q2 1 4.5 1.5t4.5 0t4 1.5t3 6q-1 1 -4 3 q-3 3 -4 3q7 -3 28.5 1.5t27.5 -1.5q15 -11 22 2q0 1 -2.5 9.5t-0.5 13.5q5 -27 29 -9q3 -3 15.5 -5t17.5 -5q3 -2 7 -5.5t5.5 -4.5t5 0.5t8.5 6.5q10 -14 12 -24q11 -40 19 -44q7 -3 11 -2t4.5 9.5t0 14t-1.5 12.5l-1 8v18l-1 8q
 -15 3 -18.5 12t1.5 18.5t15 18.5q1 1 8 3.5 t15.5 6.5t12.5 8q21 19 15 35q7 0 11 9q-1 0 -5 3t-7.5 5t-4.5 2q9 5 2 16q5 3 7.5 11t7.5 10q9 -12 21 -2q7 8 1 16q5 7 20.5 10.5t18.5 9.5q7 -2 8 2t1 12t3 12q4 5 15 9t13 5l17 11q3 4 0 4q18 -2 31 11q10 11 -6 20q3 6 -3 9.5t-15 5.5q3 1 11.5 0.5t10.5 1.5 q15 10 -7 16q-17 5 -43 -12zM879 10q206 36 351 189q-3 3 -12.5 4.5t-12.5 3.5q-18 7 -24 8q1 7 -2.5 13t-8 9t-12.5 8t-11 7q-2 2 -7 6t-7 5.5t-7.5 4.5t-8.5 2t-10 -1l-3 -1q-3 -1 -5.5 -2.5t-5.5 -3t-4 -3t0 -2.5q-21 17 -36 22q-5 1 -11 5.5t-10.5 7t-10 1.5t-11.5 -7 q-5 -5 -6 -15t-2 -13q-7 5 0 17.5t2 18.5q-3 6 -10.5 4.5t-12 -4.5t-11.5 -8.5t-9 -6.5t-8.5 -5.5t-8.5 -7.5q-3 -4 -6 -12t-5 -11q-2 4 -11.5 6.5t-9.5 5.5q2 -10 4 -35t5 -38q7 -31 -12 -48q-27 -25 -29 -40q-4 -22 12 -26q0 -7 -8 -20.5t-7 -21.5q0 -6 2 -16z" />
+<glyph unicode="&#xf0ad;" horiz-adv-x="1664" d="M384 6

<TRUNCATED>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_static/fonts/fontawesome-webfont.ttf
----------------------------------------------------------------------
diff --git a/content/docs/_static/fonts/fontawesome-webfont.ttf b/content/docs/_static/fonts/fontawesome-webfont.ttf
new file mode 100644
index 0000000..e89738d
Binary files /dev/null and b/content/docs/_static/fonts/fontawesome-webfont.ttf differ

[44/60] [abbrv] incubator-usergrid git commit: Adding in missing section references, still more work to do on this.

[sn...@apache.org]

Adding in missing section references, still more work to do on this.

(cherry picked from commit b91895cd844bbe42d07c2a7c5d5f09402ab76cbe)


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/c4116fa2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/c4116fa2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/c4116fa2

Branch: refs/heads/two-dot-o-dev
Commit: c4116fa2ed86de641c1e33b176b68be1d678e9a4
Parents: 24aa4da
Author: Dave Johnson <sn...@apache.org>
Authored: Thu Aug 6 11:36:14 2015 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Wed Aug 12 13:02:44 2015 -0400

----------------------------------------------------------------------
 .../file-storage-configuration.md               |   39 -
 docs/asset-and-files/folders.md                 |   85 --
 docs/asset-and-files/legacy-asset-support.md    |    0
 docs/asset-and-files/retrieving-assets.md       |   27 -
 docs/asset-and-files/uploading-assets.md        |   86 --
 .../file-storage-configuration.md               |   39 +
 docs/assets-and-files/folders.md                |   85 ++
 docs/assets-and-files/legacy-asset-support.md   |    0
 docs/assets-and-files/retrieving-assets.md      |   27 +
 docs/assets-and-files/uploading-assets.md       |   86 ++
 docs/introduction/usergrid-features.md          |   28 +-
 docs/rest-endpoints/api-docs.md                 | 1151 +++++++-----------
 docs/security-and-auth/using-permissions.md     |    2 +-
 docs/user-management/activity.md                |    6 +-
 docs/user-management/group.md                   |   12 +-
 docs/user-management/messagee-example.md        |    2 +-
 docs/user-management/working-user-data.md       |   12 +-
 17 files changed, 707 insertions(+), 980 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c4116fa2/docs/asset-and-files/file-storage-configuration.md
----------------------------------------------------------------------
diff --git a/docs/asset-and-files/file-storage-configuration.md b/docs/asset-and-files/file-storage-configuration.md
deleted file mode 100644
index c56265a..0000000
--- a/docs/asset-and-files/file-storage-configuration.md
+++ /dev/null
@@ -1,39 +0,0 @@
-# File storage configuration
-
-Usergrid can store your assets either on your hard drive or in the Amazon S3 cloud.
-
-Local storage configuration
----
-
-By default assets are stored in the temporary folder /tmp/usergrid
-This can be changed by editing this file /stack/rest/src/main/resources/usergrid-rest-context.xml and replacing {usergrid.temp.files} by the wanted destination
-```xml
-<bean id="binaryStore" class="org.apache.usergrid.services.assets.data.LocalFileBinaryStore">
-  <property name="reposLocation" value="${usergrid.temp.files}"/>
-</bean>
-```
-
-AwS S3 configuration
----
-
-To use your AWS S3 storage you need to change the binaryStore classpath and add several constructor arguments in /stack/rest/src/main/resources/usergrid-rest-context.xml
-
-Some examples :
-```xml
-<bean id="binaryStore" class="org.apache.usergrid.services.assets.data.AwsSdkS3BinaryStore">
-  <constructor-arg name="accessId" value="x" />
-  <constructor-arg name="secretKey" value="xx" />
-  <constructor-arg name="bucketName" value="x" />
-  <constructor-arg name="regionName" value="eu-central-1" />
-</bean>
-```
-the regionName field is not mandatory, this code is also valid
-```xml
-<bean id="binaryStore" class="org.apache.usergrid.services.assets.data.AwsSdkS3BinaryStore">
-  <constructor-arg name="accessId" value="x" />
-  <constructor-arg name="secretKey" value="xx" />
-  <constructor-arg name="bucketName" value="x" />
-</bean>
-```
-
-The filesize is limited to 50GB but you need to keep in mind that the file has to be stored on the hard drive before being sended to Amazon.

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c4116fa2/docs/asset-and-files/folders.md
----------------------------------------------------------------------
diff --git a/docs/asset-and-files/folders.md b/docs/asset-and-files/folders.md
deleted file mode 100644
index 7c425be..0000000
--- a/docs/asset-and-files/folders.md
+++ /dev/null
@@ -1,85 +0,0 @@
-# Folders
-
-## Linking a folder to an asset
-In order to access the asset for the image in the folder, you need to link the folder to the asset. You can do that by issuing a POST request in the following format:
-
-    POST /{org-uuid}/{app-uuid}/folders/{folder-uuid}/assets/{assets_id}
-    
-where ``{folder-uuid}`` is the UUID of the folder, and ``{assets-uuid}`` is the UUID of the assets entity.
-
-Here’s how you could link the folder and the asset you created for the my-image.jpg image:
-
-    POST https://api.usergrid.com/my-org/my-app/folders/6640a601-2ac6-11e2-92c3-02e81ae640dc/assets/9501cda1-2d21-11e2-b4c6-02e81ac5a17b 
-    
-In the response, you should see the assets entity for the image added to the folder:
-
-    {
-      "action": "post",
-      "application": "3400ba10-cd0c-11e1-bcf7-12313d1c4491",
-      "params": {},
-      "path": "/folders/6640a601-2ac6-11e2-92c3-02e81ae640dc/assets",
-      "uri": "https://api.usergrid.com/my-org/my-app/folders/6640a601-2ac6-11e2-92c3-02e81ae640dc/assets",
-      "entities": [
-        {
-          "uuid": "9501cda1-2d21-11e2-b4c6-02e81ac5a17b",
-          "type": "asset",
-          "name": "my-image.jpg",
-          "created": 1352763303163,
-          "modified": 1352763303163,
-          "metadata": {
-            "path": "/folders/6640a601-2ac6-11e2-92c3-02e81ae640dc/assets/9501cda1-2d21-11e2-b4c6-02e81ac5a17b"
-          },
-          "owner": "5c0c1789-d503-11e1-b36a-12313b01d5c1",
-          "path": "/myassets/asset1"
-        }
-      ],
-      "timestamp": 1352830448045,
-      "duration": 54,
-      "organization": "my-org”,
-      "applicationName": "my-app"
-    }
-    
-## Retrieve list of folder assets
-You can also request a list of the linked contents of the folder like this:
-
-    GET https://api.usergrid.com/my-org/my-app/folders/6640a601-2ac6-11e2-92c3-02e81ae640dc/assets
-    
-The response should look something like this:
-
-    {
-      "action": "get",
-      "application": "3400ba10-cd0c-11e1-bcf7-12313d1c4491",
-      "params": {
-        "_": [
-          "1352830364891"
-        ]
-      },
-      "path": "/folders/6640a601-2ac6-11e2-92c3-02e81ae640dc/assets",
-      "uri": "https://api.usergrid.com/my-org/my-app/folders/6640a601-2ac6-11e2-92c3-02e81ae640dc/assets",
-      "entities": [
-        {
-          "uuid": "7bf47435-2ac8-11e2-b4c6-02e81ac5a17b",
-          "type": "asset",
-          "name": "my-image.jpg",
-          "created": 1352505133598,
-          "modified": 1352507245108,
-          "checksum": "8e0cd3866ee20746c99e9a9825f38ad8",
-          "content-length": 11853,
-          "content-type": "image/jpeg",
-          "etag": "\"8e0cd3866ee20746c99e9a9825f38ad8\"",
-          "metadata": {
-            "connecting": {
-              "assets": "/folders/6640a601-2ac6-11e2-92c3-02e81ae640dc/assets/7bf47435-2ac8-11e2-b4c6-02e81ac5a17b/connecting/assets"
-            },
-            "connection": "assets",
-            "path": "/folders/6640a601-2ac6-11e2-92c3-02e81ae640dc/assets/7bf47435-2ac8-11e2-b4c6-02e81ac5a17b"
-          },
-          "owner": "5c0c1789-d503-11e1-b36a-12313b01d5c1",
-          "path": "my-image"
-        }
-      ],
-      "timestamp": 1352830363797,
-      "duration": 57,
-      "organization": "my-org",
-      "applicationName": "my-app"
-    }

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c4116fa2/docs/asset-and-files/legacy-asset-support.md
----------------------------------------------------------------------
diff --git a/docs/asset-and-files/legacy-asset-support.md b/docs/asset-and-files/legacy-asset-support.md
deleted file mode 100644
index e69de29..0000000

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c4116fa2/docs/asset-and-files/retrieving-assets.md
----------------------------------------------------------------------
diff --git a/docs/asset-and-files/retrieving-assets.md b/docs/asset-and-files/retrieving-assets.md
deleted file mode 100644
index 9313ae8..0000000
--- a/docs/asset-and-files/retrieving-assets.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# Retrieving assets
-
-## Retrieving asset data
-
-To retrieve the asset from an entity, send a ``GET`` request with the ``Accept`` header set to the content type of the asset. The content type can be retrieved from the ``file-metadata.content-type`` property of the entity the asset is attached to.
-
-### Request syntax
-
-    curl -X GET -H 'Accept: <content_type>' 'https://api.usergrid.com/<org>/<app>/<collection>/<entity>
-
-Parameters
-
-Parameter	     Description
----------        -----------
-content_type	 The content type of the attached asset. For example, text/plain, image/jpeg.
-org	Organization UUID or organization name
-app	Application  UUID or application name
-collection	     Name or UUID of the collection of the entity the asset is attached to.
-entity	         Name or UUID of the entity the asset is attached to.
-
-### Example request
-The following request will retrieve the data for a jpeg file attached to an entity named 'cloud' in the 'pictures' collection:
-
-    curl -X GET -H 'Accept: image/jpeg' 'https://api.usergrid.com/your-org/your-app/pictures/cloud
-    
-## Retrieving an asset entity
-To retrieve the entity that an asset is attached to, perform a ``GET`` request as you normally would to retrieve an entity. For more information, see [Retrieving Data Entities](../data-storage/entities.html#retrieving-data-entities).
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c4116fa2/docs/asset-and-files/uploading-assets.md
----------------------------------------------------------------------
diff --git a/docs/asset-and-files/uploading-assets.md b/docs/asset-and-files/uploading-assets.md
deleted file mode 100644
index c5b836f..0000000
--- a/docs/asset-and-files/uploading-assets.md
+++ /dev/null
@@ -1,86 +0,0 @@
-# Uploading assets
-
-With Usergrid, you can store and retrieve files and assets that hold data objects such as images, video, and audio content.
-
-Usergrid manages these objects as Asset entities. Optionally, you can use Folder entities to organize related assets.
-
-## Uploading assets
-Assets can be any file type and can be attached to any entity. When an asset is uploaded, Usergrid will automatically detect the file metadata for the asset and save it in the associated entity as a ``file-metadata`` property. Only 1 asset can be attached to an entity.
-
-To attach an asset to an entity, do the following:
-
-### Request syntax
-
-    curl -X POST -F name='<filename>' -F file=@<file_location> 'https://api.usergrid.com/<org>/<app>/<collection>/<entity>
-    
-Parameters
-
-Parameter	        Description
----------           -----------
-filename	        A filename to associate with the asset.
-file_location	    The location of the asset to be uploaded.
-org	Organization    UUID or organization name
-app	Application     UUID or application name
-collection	        Name or UUID of the collection of the entity you want to attach the asset to.
-entity	            Name or UUID of an existing entity you want to attach the asset to.
-
-### Example request
-
-    curl -X POST -i -F name='clouds' -F file=@happy_clouds.jpg 'https://api.usergrid.com/your-org/your-app/pictures/'
-    
-### Example response
-
-Notice the ``file-metadata`` property in the response.
-
-    {
-        "action" : "post",
-        "application" : "f34f4222-a166-11e2-a7f7-02e81adcf3d0",
-        "params" : { },
-        "path" : "/users",
-        "uri" : "https://api.usergrid.com/amuramoto/sandbox/pictures",
-        "entities" : [ {
-        "uuid" : "410b213a-b379-11e3-a0e5-9953085ea376",
-        "type" : "user",
-        "name" : "test",
-        "created" : 1395681911491,
-        "modified" : 1399069838919,
-        "name" : "clouds",    
-        "file" : "fobnszewobnioerabnoiawegbrn\n",
-        "file-metadata" : {
-          "content-type" : "image/jpeg",
-          "etag" : "\"2e1db7299b0a667ed80e674a0ef9d653\"",
-          "last-modified" : 1399070010115,
-          "content-length" : 28,
-          "checksum" : "2e1db7299b0a667ed80e674a0ef9d653"
-        },
-        "metadata" : {
-          "connecting" : {        
-            "likes" : "/users/410b213a-b379-11e3-a0e5-9953085ea376/connecting/likes"
-          },
-          "path" : "/users/410b213a-b379-11e3-a0e5-9953085ea376",
-          "sets" : {
-            "rolenames" : "/users/410b213a-b379-11e3-a0e5-9953085ea376/roles",
-            "permissions" : "/users/410b213a-b379-11e3-a0e5-9953085ea376/permissions"
-          },
-          "connections" : {
-            "follows" : "/users/410b213a-b379-11e3-a0e5-9953085ea376/follows"
-          },
-          "collections" : {
-            "activities" : "/users/410b213a-b379-11e3-a0e5-9953085ea376/activities",
-            "devices" : "/users/410b213a-b379-11e3-a0e5-9953085ea376/devices",
-            "feed" : "/users/410b213a-b379-11e3-a0e5-9953085ea376/feed",
-            "groups" : "/users/410b213a-b379-11e3-a0e5-9953085ea376/groups",
-            "roles" : "/users/410b213a-b379-11e3-a0e5-9953085ea376/roles",
-            "following" : "/users/410b213a-b379-11e3-a0e5-9953085ea376/following",
-            "followers" : "/users/410b213a-b379-11e3-a0e5-9953085ea376/followers"
-          }
-        }
-        } ],
-        "timestamp" : 1399070009986,
-        "duration" : 441,
-        "organization" : "your-org",
-        "applicationName" : "your-app"
-    }
-
-## Updating assets
-To update the data for an asset, perform the same request outlined above in 'Uploading assets' as a ``PUT`` request rather than a ``POST``.

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c4116fa2/docs/assets-and-files/file-storage-configuration.md
----------------------------------------------------------------------
diff --git a/docs/assets-and-files/file-storage-configuration.md b/docs/assets-and-files/file-storage-configuration.md
new file mode 100644
index 0000000..c56265a
--- /dev/null
+++ b/docs/assets-and-files/file-storage-configuration.md
@@ -0,0 +1,39 @@
+# File storage configuration
+
+Usergrid can store your assets either on your hard drive or in the Amazon S3 cloud.
+
+Local storage configuration
+---
+
+By default assets are stored in the temporary folder /tmp/usergrid
+This can be changed by editing this file /stack/rest/src/main/resources/usergrid-rest-context.xml and replacing {usergrid.temp.files} by the wanted destination
+```xml
+<bean id="binaryStore" class="org.apache.usergrid.services.assets.data.LocalFileBinaryStore">
+  <property name="reposLocation" value="${usergrid.temp.files}"/>
+</bean>
+```
+
+AwS S3 configuration
+---
+
+To use your AWS S3 storage you need to change the binaryStore classpath and add several constructor arguments in /stack/rest/src/main/resources/usergrid-rest-context.xml
+
+Some examples :
+```xml
+<bean id="binaryStore" class="org.apache.usergrid.services.assets.data.AwsSdkS3BinaryStore">
+  <constructor-arg name="accessId" value="x" />
+  <constructor-arg name="secretKey" value="xx" />
+  <constructor-arg name="bucketName" value="x" />
+  <constructor-arg name="regionName" value="eu-central-1" />
+</bean>
+```
+the regionName field is not mandatory, this code is also valid
+```xml
+<bean id="binaryStore" class="org.apache.usergrid.services.assets.data.AwsSdkS3BinaryStore">
+  <constructor-arg name="accessId" value="x" />
+  <constructor-arg name="secretKey" value="xx" />
+  <constructor-arg name="bucketName" value="x" />
+</bean>
+```
+
+The filesize is limited to 50GB but you need to keep in mind that the file has to be stored on the hard drive before being sended to Amazon.

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c4116fa2/docs/assets-and-files/folders.md
----------------------------------------------------------------------
diff --git a/docs/assets-and-files/folders.md b/docs/assets-and-files/folders.md
new file mode 100644
index 0000000..7c425be
--- /dev/null
+++ b/docs/assets-and-files/folders.md
@@ -0,0 +1,85 @@
+# Folders
+
+## Linking a folder to an asset
+In order to access the asset for the image in the folder, you need to link the folder to the asset. You can do that by issuing a POST request in the following format:
+
+    POST /{org-uuid}/{app-uuid}/folders/{folder-uuid}/assets/{assets_id}
+    
+where ``{folder-uuid}`` is the UUID of the folder, and ``{assets-uuid}`` is the UUID of the assets entity.
+
+Here’s how you could link the folder and the asset you created for the my-image.jpg image:
+
+    POST https://api.usergrid.com/my-org/my-app/folders/6640a601-2ac6-11e2-92c3-02e81ae640dc/assets/9501cda1-2d21-11e2-b4c6-02e81ac5a17b 
+    
+In the response, you should see the assets entity for the image added to the folder:
+
+    {
+      "action": "post",
+      "application": "3400ba10-cd0c-11e1-bcf7-12313d1c4491",
+      "params": {},
+      "path": "/folders/6640a601-2ac6-11e2-92c3-02e81ae640dc/assets",
+      "uri": "https://api.usergrid.com/my-org/my-app/folders/6640a601-2ac6-11e2-92c3-02e81ae640dc/assets",
+      "entities": [
+        {
+          "uuid": "9501cda1-2d21-11e2-b4c6-02e81ac5a17b",
+          "type": "asset",
+          "name": "my-image.jpg",
+          "created": 1352763303163,
+          "modified": 1352763303163,
+          "metadata": {
+            "path": "/folders/6640a601-2ac6-11e2-92c3-02e81ae640dc/assets/9501cda1-2d21-11e2-b4c6-02e81ac5a17b"
+          },
+          "owner": "5c0c1789-d503-11e1-b36a-12313b01d5c1",
+          "path": "/myassets/asset1"
+        }
+      ],
+      "timestamp": 1352830448045,
+      "duration": 54,
+      "organization": "my-org”,
+      "applicationName": "my-app"
+    }
+    
+## Retrieve list of folder assets
+You can also request a list of the linked contents of the folder like this:
+
+    GET https://api.usergrid.com/my-org/my-app/folders/6640a601-2ac6-11e2-92c3-02e81ae640dc/assets
+    
+The response should look something like this:
+
+    {
+      "action": "get",
+      "application": "3400ba10-cd0c-11e1-bcf7-12313d1c4491",
+      "params": {
+        "_": [
+          "1352830364891"
+        ]
+      },
+      "path": "/folders/6640a601-2ac6-11e2-92c3-02e81ae640dc/assets",
+      "uri": "https://api.usergrid.com/my-org/my-app/folders/6640a601-2ac6-11e2-92c3-02e81ae640dc/assets",
+      "entities": [
+        {
+          "uuid": "7bf47435-2ac8-11e2-b4c6-02e81ac5a17b",
+          "type": "asset",
+          "name": "my-image.jpg",
+          "created": 1352505133598,
+          "modified": 1352507245108,
+          "checksum": "8e0cd3866ee20746c99e9a9825f38ad8",
+          "content-length": 11853,
+          "content-type": "image/jpeg",
+          "etag": "\"8e0cd3866ee20746c99e9a9825f38ad8\"",
+          "metadata": {
+            "connecting": {
+              "assets": "/folders/6640a601-2ac6-11e2-92c3-02e81ae640dc/assets/7bf47435-2ac8-11e2-b4c6-02e81ac5a17b/connecting/assets"
+            },
+            "connection": "assets",
+            "path": "/folders/6640a601-2ac6-11e2-92c3-02e81ae640dc/assets/7bf47435-2ac8-11e2-b4c6-02e81ac5a17b"
+          },
+          "owner": "5c0c1789-d503-11e1-b36a-12313b01d5c1",
+          "path": "my-image"
+        }
+      ],
+      "timestamp": 1352830363797,
+      "duration": 57,
+      "organization": "my-org",
+      "applicationName": "my-app"
+    }

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c4116fa2/docs/assets-and-files/legacy-asset-support.md
----------------------------------------------------------------------
diff --git a/docs/assets-and-files/legacy-asset-support.md b/docs/assets-and-files/legacy-asset-support.md
new file mode 100644
index 0000000..e69de29

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c4116fa2/docs/assets-and-files/retrieving-assets.md
----------------------------------------------------------------------
diff --git a/docs/assets-and-files/retrieving-assets.md b/docs/assets-and-files/retrieving-assets.md
new file mode 100644
index 0000000..9313ae8
--- /dev/null
+++ b/docs/assets-and-files/retrieving-assets.md
@@ -0,0 +1,27 @@
+# Retrieving assets
+
+## Retrieving asset data
+
+To retrieve the asset from an entity, send a ``GET`` request with the ``Accept`` header set to the content type of the asset. The content type can be retrieved from the ``file-metadata.content-type`` property of the entity the asset is attached to.
+
+### Request syntax
+
+    curl -X GET -H 'Accept: <content_type>' 'https://api.usergrid.com/<org>/<app>/<collection>/<entity>
+
+Parameters
+
+Parameter	     Description
+---------        -----------
+content_type	 The content type of the attached asset. For example, text/plain, image/jpeg.
+org	Organization UUID or organization name
+app	Application  UUID or application name
+collection	     Name or UUID of the collection of the entity the asset is attached to.
+entity	         Name or UUID of the entity the asset is attached to.
+
+### Example request
+The following request will retrieve the data for a jpeg file attached to an entity named 'cloud' in the 'pictures' collection:
+
+    curl -X GET -H 'Accept: image/jpeg' 'https://api.usergrid.com/your-org/your-app/pictures/cloud
+    
+## Retrieving an asset entity
+To retrieve the entity that an asset is attached to, perform a ``GET`` request as you normally would to retrieve an entity. For more information, see [Retrieving Data Entities](../data-storage/entities.html#retrieving-data-entities).
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c4116fa2/docs/assets-and-files/uploading-assets.md
----------------------------------------------------------------------
diff --git a/docs/assets-and-files/uploading-assets.md b/docs/assets-and-files/uploading-assets.md
new file mode 100644
index 0000000..c5b836f
--- /dev/null
+++ b/docs/assets-and-files/uploading-assets.md
@@ -0,0 +1,86 @@
+# Uploading assets
+
+With Usergrid, you can store and retrieve files and assets that hold data objects such as images, video, and audio content.
+
+Usergrid manages these objects as Asset entities. Optionally, you can use Folder entities to organize related assets.
+
+## Uploading assets
+Assets can be any file type and can be attached to any entity. When an asset is uploaded, Usergrid will automatically detect the file metadata for the asset and save it in the associated entity as a ``file-metadata`` property. Only 1 asset can be attached to an entity.
+
+To attach an asset to an entity, do the following:
+
+### Request syntax
+
+    curl -X POST -F name='<filename>' -F file=@<file_location> 'https://api.usergrid.com/<org>/<app>/<collection>/<entity>
+    
+Parameters
+
+Parameter	        Description
+---------           -----------
+filename	        A filename to associate with the asset.
+file_location	    The location of the asset to be uploaded.
+org	Organization    UUID or organization name
+app	Application     UUID or application name
+collection	        Name or UUID of the collection of the entity you want to attach the asset to.
+entity	            Name or UUID of an existing entity you want to attach the asset to.
+
+### Example request
+
+    curl -X POST -i -F name='clouds' -F file=@happy_clouds.jpg 'https://api.usergrid.com/your-org/your-app/pictures/'
+    
+### Example response
+
+Notice the ``file-metadata`` property in the response.
+
+    {
+        "action" : "post",
+        "application" : "f34f4222-a166-11e2-a7f7-02e81adcf3d0",
+        "params" : { },
+        "path" : "/users",
+        "uri" : "https://api.usergrid.com/amuramoto/sandbox/pictures",
+        "entities" : [ {
+        "uuid" : "410b213a-b379-11e3-a0e5-9953085ea376",
+        "type" : "user",
+        "name" : "test",
+        "created" : 1395681911491,
+        "modified" : 1399069838919,
+        "name" : "clouds",    
+        "file" : "fobnszewobnioerabnoiawegbrn\n",
+        "file-metadata" : {
+          "content-type" : "image/jpeg",
+          "etag" : "\"2e1db7299b0a667ed80e674a0ef9d653\"",
+          "last-modified" : 1399070010115,
+          "content-length" : 28,
+          "checksum" : "2e1db7299b0a667ed80e674a0ef9d653"
+        },
+        "metadata" : {
+          "connecting" : {        
+            "likes" : "/users/410b213a-b379-11e3-a0e5-9953085ea376/connecting/likes"
+          },
+          "path" : "/users/410b213a-b379-11e3-a0e5-9953085ea376",
+          "sets" : {
+            "rolenames" : "/users/410b213a-b379-11e3-a0e5-9953085ea376/roles",
+            "permissions" : "/users/410b213a-b379-11e3-a0e5-9953085ea376/permissions"
+          },
+          "connections" : {
+            "follows" : "/users/410b213a-b379-11e3-a0e5-9953085ea376/follows"
+          },
+          "collections" : {
+            "activities" : "/users/410b213a-b379-11e3-a0e5-9953085ea376/activities",
+            "devices" : "/users/410b213a-b379-11e3-a0e5-9953085ea376/devices",
+            "feed" : "/users/410b213a-b379-11e3-a0e5-9953085ea376/feed",
+            "groups" : "/users/410b213a-b379-11e3-a0e5-9953085ea376/groups",
+            "roles" : "/users/410b213a-b379-11e3-a0e5-9953085ea376/roles",
+            "following" : "/users/410b213a-b379-11e3-a0e5-9953085ea376/following",
+            "followers" : "/users/410b213a-b379-11e3-a0e5-9953085ea376/followers"
+          }
+        }
+        } ],
+        "timestamp" : 1399070009986,
+        "duration" : 441,
+        "organization" : "your-org",
+        "applicationName" : "your-app"
+    }
+
+## Updating assets
+To update the data for an asset, perform the same request outlined above in 'Uploading assets' as a ``PUT`` request rather than a ``POST``.

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c4116fa2/docs/introduction/usergrid-features.md
----------------------------------------------------------------------
diff --git a/docs/introduction/usergrid-features.md b/docs/introduction/usergrid-features.md
index 5e57071..1a2f0d6 100644
--- a/docs/introduction/usergrid-features.md
+++ b/docs/introduction/usergrid-features.md
@@ -10,21 +10,21 @@ With Usergrid, developers can set up their own cloud-based data platform in minu
 
 At the core of Usergrid is a flexible platform that can store any type of application data, from simple records like a catalog of books to complex associations like user relationships. No matter what type of data drives your app, you can store it as collections of data entities and immediately perform complex queries or full-text searches on any field. You can also create custom entities with custom properties, giving you the ability to store data and context in a way that makes sense for your app.
 
-To learn more about entities and collections, see Usergrid Data model.
+To learn more about entities and collections, see [Usergrid Data model](data-model.html).
 
-For a complete list of the default data entities available, see Default Data Entity Types.
+For a complete list of the default data entities available, see [Models](../rest-endpoint/api-docs.html#models).
 
 ### Files & assets
 
 Images, video, and audio are key components of a great app experience. With Usergrid, you can upload and retrieve binary objects from the same data store as the rest of your application data, eliminating the need to set up content delivery networks (CDNs) and easing implementation. We handle all the back-end details that keep your content quickly accessible.
 
-To learn more about files and asset storage, see Uploading files and assets .
+To learn more about files and asset storage, see [Uploading files and assets](../assets-and-files/uploading-assets.html).
 
 ## Flexible data querying
 
 One of Usergrid' most powerful features is the ability to perform SQL-style queries and full-text searches on data entities, as well as their properties. This lets you quickly retrieve specific data entities based on multiple criteria, then utilize that data to power social features, target push notifications, perform user analysis, and more.
 
-Learn more about querying app data, see Data query overview.
+Learn more about querying app data, see [Data query overview](../data-queries/querying-your-data.html).
 
 ## Social
 
@@ -32,13 +32,13 @@ Learn more about querying app data, see Data query overview.
 
 You can create relationships between data entities to help build features, improve user experience, and contextualize data. For example, you might associate a user with their devices to capture valuable geolocation data, create relationships between users to build social graphs, or implement popular features such as activity streams.
 
-To learn more about entity relationships, see Entity connections.
+To learn more about entity relationships, see [Entity connections](../entity-connections/connecting-entities.html).
 
 ### Activity streams
 
 A key aspect of social networking apps is the ability to provide and publish data streams of user actions, such as ongoing lists of comments, activities, and tweets. Usergrid simplifies management and routing of these data streams by providing an activity entity that is specifically designed to automatically create a relationship between activities and the user who created them.
 
-To learn more about activities and activity feeds, see Activity feeds.
+To learn more about activities and activity feeds, see [Activity feeds](../user-management/activity.html).
 
 ## User management
 
@@ -46,7 +46,7 @@ To learn more about activities and activity feeds, see Activity feeds.
 
 You can easily add and manage users by providing the core services necessary to handle secure registration and log in, including OAuth 2.0-compliant client authentication. In addition, any number of default or custom data entities and properties can be associated with a user entity to create complete user profiles.
 
-To learn more about user management, see User.
+To learn more about user management, see [User Management](../user-management/user-management.html).
 
 To learn more about authentication, see Authenticating users and application clients.
 
@@ -54,28 +54,28 @@ To learn more about authentication, see Authenticating users and application cli
 
 Applications often require the ability to configure fine-grain control of user access to data, features and functionality. Usergrid solves the implementation details of user access with roles and permissions. Simply create roles that represent user types or access levels, such as Administrator, then assign the necessary permissions to that role. With a single API call, you can then associate your roles with any user or group of users.
 
-To learn more about user roles and permissions, see Managing access by defining permission rules.
+To learn more about user roles and permissions, see [Using Permissions](../security-and-auth/securing-your-app.html).
 
 ### Groups
 
 Groups are a flexible way to organize your users based on any number of criteria. For example, you might group users based on interests or location to more effectively deliver relevant content, target offers, or customize campaigns. You can also take advantage of the groups entity to enable group-based social networking activities, such as allowing your users to create private information feeds or circles of friends.
 
-To learn more about groups, see Working with group data.
+To learn more about groups, see [Working with group data](../user-management/groups.html).
 
 ### Third-party authentication
 
 In addition to supporting user management and OAuth-based login for your app, Usergrid also makes it easy to integrate third-party authentication through such popular services as Facebook, Twitter and other OAuth-enabled accounts. Providing third-party sign-in can improve user experience, while increasing adoption, giving you access to valuable information from social networks and services.
 
-To learn more about using third-party sign-in, see Facebook sign in.
+To learn more about using third-party sign-in, see [Facebook sign in](../security-and-auth/facebook-sign.html).
 
 ## Geolocation
 
 The device entity allows you to capture geolocation data from your users' GPS-enabled devices to more effectively target campaigns, push notifications, offers and more. Geolocation also gives you an important data point for contextualizing and analyzing trends and user behavior.
 
-To learn more about geolocation, see Geolocation.
+To learn more about geolocation, see [Geolocation](../geolocation/geolocation.html).
 
-## Push notifications
+## Push notifications (Coming soon...)
 
-Push notifications are the most effective way to engage your users with relevant content, and thanks to Usergrid, implementing them can be done in minutes. Simply register your app and your user's devices with a notification provider, such as Apple Push Notification Service or Google Cloud Messaging, then use the Usergrid notification entity to send millions of push notifications a month at no cost. When used in conjunction with queries of user and application data, push notifications become a powerful tool for leveraging user data, ensuring relevancy and driving engagement.
+__(Coming Usergrid 2.0)__ Push notifications are the most effective way to engage your users with relevant content, and thanks to Usergrid, implementing them can be done in minutes. Simply register your app and your user's devices with a notification provider, such as Apple Push Notification Service or Google Cloud Messaging, then use the Usergrid notification entity to send millions of push notifications a month at no cost. When used in conjunction with queries of user and application data, push notifications become a powerful tool for leveraging user data, ensuring relevancy and driving engagement.
 
-To learn more about push notifications, see Push notifications overview.
+To learn more about push notifications, see [Push notifications overview](../push-notifications/tbd.html).

[43/60] [abbrv] incubator-usergrid git commit: Adding in missing section references, still more work to do on this.

[sn...@apache.org]

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c4116fa2/docs/rest-endpoints/api-docs.md
----------------------------------------------------------------------
diff --git a/docs/rest-endpoints/api-docs.md b/docs/rest-endpoints/api-docs.md
index 93a6e32..fa39d59 100644
--- a/docs/rest-endpoints/api-docs.md
+++ b/docs/rest-endpoints/api-docs.md
@@ -1,161 +1,21 @@
 ## Methods
-### Action Methods
+### Access-Tokens Methods
 
-<h2 class="usergrid-GET-heading">GET /management/orgs/{orgId}/activate</h2>
-
-Activate an organization from a link provIded in an email notification.
-
-<h3>Parameters</h3>
-
-* __orgId__ (string)
-One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-* __token__ ()
-Activation token. (Specified in query).
-* __confirm_email__ ()
-Send confirmation email or not. (Specified in query).
-
-<h3>Responses</h3>
-
-__200__
-
-* Description: An array of complete messages.
-* Schema: [Action](#action)
-    
-__default__
-
-* Description: Unexpected error.
-* Schema: [Error](#error)
-    
-
-<h2 class="usergrid-GET-heading">GET /management/orgs/{orgId}/reactivate</h2>
-
-Reactivate an expired organization.
-
-<h3>Parameters</h3>
-
-* __orgId__ (string)
-One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-
-<h3>Responses</h3>
-
-__200__
-
-* Description: An array of complete messages.
-* Schema: [Action](#action)
-    
-__default__
-
-* Description: Unexpected error.
-* Schema: [Error](#error)
-    
-
-<h2 class="usergrid-GET-heading">GET /management/users/resetpw</h2>
-
-Initiate the reset of an admin user&#39;s password.
-
-<h3>Parameters</h3>
-
-
-<h3>Responses</h3>
-
-__200__
-
-* Description: An array of complete messages.
-* Schema: [Action](#action)
-    
-__default__
-
-* Description: Unexpected error.
-* Schema: [Error](#error)
-    
-
-<h2 class="usergrid-POST-heading">POST /management/users/resetpw</h2>
-
-Complete the password reset through getting the newpassword and the old one for identification.
-
-<h3>Parameters</h3>
-
-* __ResetPWMsg__ ([ResetPWMsg](#resetpwmsg))
-Parameters and value for the Captcha challenge, the admin user&#39;s response to the Captcha challenge, and the admin user&#39;s email address. (Specified in body).
-
-<h3>Responses</h3>
-
-__200__
-
-* Description: An array of complete messages.
-* Schema: [Action](#action)
-    
-__default__
-
-* Description: Unexpected error.
-* Schema: [Error](#error)
-    
-
-<h2 class="usergrid-GET-heading">GET /management/users/{userId}/activate</h2>
-
-Activate an admin user from a link provIded in an email notification.
-
-<h3>Parameters</h3>
-
-* __userId__ (string)
-One of the user&#39;s identification which includes username, real name, email address or UUID. (Specified in path).
-* __token__ ()
-Activation token&#39;s query statement. (Specified in query).
-* __confirm_email__ ()
-Query statement of whether send confimation email or not. (Specified in query).
-
-<h3>Responses</h3>
-
-__200__
-
-* Description: An array of complete messages.
-* Schema: [Action](#action)
-    
-__default__
-
-* Description: Unexpected error.
-* Schema: [Error](#error)
-    
-
-<h2 class="usergrid-PUT-heading">PUT /management/users/{userId}/password</h2>
-
-Update an admin user&#39;s password through getting the newpassword and the old one for identification.
-
-<h3>Parameters</h3>
+<h2 class="usergrid-POST-heading">POST /management/token</h2>
 
-* __userId__ (string)
-One of the user&#39;s identification which includes username, real name, email address or UUID. (Specified in path).
-* __ResetPW__ ([ResetPW](#resetpw))
-The user&#39;s old and new password. (Specified in body).
-
-<h3>Responses</h3>
-
-__200__
-
-* Description: An array of complete messages.
-* Schema: [Action](#action)
-    
-__default__
-
-* Description: Unexpected error.
-* Schema: [Error](#error)
-    
-
-<h2 class="usergrid-GET-heading">GET /management/users/{userId}/reactivate</h2>
-
-Reactivate an expired admin user.
+Login with Admin-User or Organization credentials.
 
 <h3>Parameters</h3>
 
-* __userId__ (string)
-One of the user&#39;s identification which includes username, real name, email address or UUID. (Specified in path).
+* __login-credentials__ ([LoginCredentials](#logincredentials))
+Login credentials either username/password or id/secret. (Specified in body).
 
 <h3>Responses</h3>
 
 __200__
 
-* Description: An array of complete messages.
-* Schema: [Action](#action)
+* Description: Object containing access_token.
+* Schema: [AccessTokenReponse](#accesstokenreponse)
     
 __default__
 
@@ -163,106 +23,28 @@ __default__
 * Schema: [Error](#error)
     
 
-<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/users/{user}/password</h2>
+<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/token</h2>
 
-Set a user&#39;s password or reset the user&#39;s existing password.
+Login with App-User or Application credentials.
 
 <h3>Parameters</h3>
 
-* __orgId__ (string)
-One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-* __appId__ (string)
-One of the application&#39;s identification which includes name or uuid. (Specified in path).
-* __username__ (string)
-The username of the user. (Specified in path).
-* __ResetPW__ ([ResetPW](#resetpw))
-The user&#39;s old and new password. (Specified in body).
+* __login-credentials__ ([LoginCredentials](#logincredentials))
+Login credentials either username/password or id/secret. (Specified in body).
 
 <h3>Responses</h3>
 
 __200__
 
-* Description: An array of complete messages.
-* Schema: [Action](#action)
-    
-__default__
-
-* Description: Unexpected error.
-* Schema: [Error](#error)
-    
-### ActivityFeed Methods
-
-<h2 class="usergrid-GET-heading">GET /management/orgs/{orgId}/feed</h2>
-
-Retrieve an organization&#39;s activity feed.
-
-<h3>Parameters</h3>
-
-* __orgId__ (string)
-One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-
-<h3>Responses</h3>
-
-__200__
-
-* Description: An array of the organization&#39;s ActivityFeed.
-* Schema: [ActivityFeed](#activityfeed)
-    
-__default__
-
-* Description: Unexpected error.
-* Schema: [Error](#error)
-    
-
-<h2 class="usergrid-GET-heading">GET /management/users/{userId}/feed</h2>
-
-Retrieve an admin user&#39;s activity feed.
-
-<h3>Parameters</h3>
-
-* __userId__ (string)
-One of the user&#39;s identification which includes username, real name, email address or UUID. (Specified in path).
-
-<h3>Responses</h3>
-
-__200__
-
-* Description: An array of user&#39;s activity
-* Schema: [ActivityFeed](#activityfeed)
-    
-__default__
-
-* Description: Unexpected error.
-* Schema: [Error](#error)
-    
-
-<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/groups/{groupId}/activities</h2>
-
-Create an activity to a specific group. In this case the activity is created in the activities collection and is accessible at the /activities endpoint to users who have the permission to read that endpoint. In addition, a relationship is established between the activity and the group, and because of that, the activity will appear in the group’s feed. The group &#39;owns&#39; the activity. Also, the activity will be published in the feed of all users that are members of the group.
-
-<h3>Parameters</h3>
-
-* __orgId__ (string)
-One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-* __appId__ (string)
-One of the application&#39;s identification which includes name or uuid. (Specified in path).
-* __groupId__ (string)
-One of the group&#39;s identification which includes name or uuid. (Specified in path).
-* __CreateActivity__ ([CreateActivity](#createactivity))
-One or more sets of activity properties. (Specified in body).
-
-<h3>Responses</h3>
-
-__200__
-
-* Description: An array of user&#39;s activity.
-* Schema: [ActivityFeed](#activityfeed)
+* Description: An array of new created Admin user&#39;s info.
+* Schema: [AccessTokenReponse](#accesstokenreponse)
     
 __default__
 
 * Description: Unexpected error.
 * Schema: [Error](#error)
     
+### Activities Methods
 
 <h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/groups/{groupId}/feed</h2>
 
@@ -343,96 +125,23 @@ __default__
 * Description: Unexpected error.
 * Schema: [Error](#error)
     
-### AppData Methods
+### Admin-Users Methods
 
-<h2 class="usergrid-GET-heading">GET /management/orgs/{orgId}/apps</h2>
-
-Retrieve the applications in an organization through providing both Id of application and organization.
-
-<h3>Parameters</h3>
-
-* __orgId__ (string)
-One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-
-<h3>Responses</h3>
-
-__200__
-
-* Description: An array of retrieved application data.
-* Schema: [AppData](#appdata)
-    
-__default__
-
-* Description: Unexpected error.
-* Schema: [Error](#error)
-    
-
-<h2 class="usergrid-DELETE-heading">DELETE /management/orgs/{orgId}/apps/{appId}</h2>
-
-Remove an application from an organization through providing both Id of application and organization.
-
-<h3>Parameters</h3>
-
-* __orgId__ (string)
-One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-* __appId__ (string)
-One of the application&#39;s identification which includes name or uuid. (Specified in path).
-
-<h3>Responses</h3>
-
-__200__
-
-* Description: An array of deleted application info.
-* Schema: [AppData](#appdata)
-    
-__default__
-
-* Description: Unexpected error.
-* Schema: [Error](#error)
-    
-### Credential Methods
-
-<h2 class="usergrid-GET-heading">GET /management/orgs/{orgId}/apps/{appId}/credentials</h2>
-
-Retrieve the client Id and client secret credentials for an application in an organization.
-
-<h3>Parameters</h3>
-
-* __orgId__ (string)
-One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-* __appId__ (string)
-One of the application&#39;s identification which includes name or uuid. (Specified in path).
-
-<h3>Responses</h3>
-
-__200__
-
-* Description: An array of retrieved credentials info.
-* Schema: [Credential](#credential)
-    
-__default__
-
-* Description: Unexpected error.
-* Schema: [Error](#error)
-    
-
-<h2 class="usergrid-POST-heading">POST /management/orgs/{orgId}/apps/{appId}/credentials</h2>
+<h2 class="usergrid-GET-heading">GET /management/orgs/{orgId}/users</h2>
 
-Generate the client Id and client secret credentials for an application in an organization.
+Retrieve details about the admin users in an organization.
 
 <h3>Parameters</h3>
 
 * __orgId__ (string)
 One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-* __appId__ (string)
-One of the application&#39;s identification which includes name or uuid. (Specified in path).
 
 <h3>Responses</h3>
 
 __200__
 
-* Description: An array of generated credentials info.
-* Schema: [Credential](#credential)
+* Description: An array of retrieved Admin user&#39;s info.
+* Schema: [User](#user)
     
 __default__
 
@@ -440,21 +149,23 @@ __default__
 * Schema: [Error](#error)
     
 
-<h2 class="usergrid-GET-heading">GET /management/orgs/{orgId}/credentials</h2>
+<h2 class="usergrid-DELETE-heading">DELETE /management/orgs/{orgId}/users/{userId}</h2>
 
-Retrieve the credentials for an organization client.
+Remove an admin user from an organization through providing both Id of application and organization.
 
 <h3>Parameters</h3>
 
 * __orgId__ (string)
 One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+* __userId-2__ (string)
+One of the user&#39;s identification which includes username, email address or UUID. (Specified in path).
 
 <h3>Responses</h3>
 
 __200__
 
-* Description: An array of Credential
-* Schema: [Credential](#credential)
+* Description: An array of deleted Admin user&#39;s info.
+* Schema: [User](#user)
     
 __default__
 
@@ -462,79 +173,63 @@ __default__
 * Schema: [Error](#error)
     
 
-<h2 class="usergrid-POST-heading">POST /management/orgs/{orgId}/credentials</h2>
+<h2 class="usergrid-POST-heading">POST /management/users</h2>
 
-Generate whole new credentials for an organization client.
+Create a whole new admin user.
 
 <h3>Parameters</h3>
 
-* __orgId__ (string)
-One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+* __adminuserproperty__ ([CreateAdminUser](#createadminuser))
+One or more sets of user properties of which username is mandatory and must be unique. (Specified in body).
 
 <h3>Responses</h3>
 
 __200__
 
-* Description: An array of Credential
-* Schema: [Credential](#credential)
+* Description: An array of new created Admin user&#39;s info.
+* Schema: [User](#user)
     
 __default__
 
 * Description: Unexpected error.
 * Schema: [Error](#error)
     
-### Devices Methods
 
-<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/{notificationId}/*/queue</h2>
+<h2 class="usergrid-GET-heading">GET /management/users/resetpw</h2>
 
-Retrieve the list of devices associated with one or more notifications before the notifications are sent through providing all the identifications.
+Initiate the reset of an admin user&#39;s password.
 
 <h3>Parameters</h3>
 
-* __orgId__ (string)
-One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-* __appId__ (string)
-One of the application&#39;s identification which includes name or uuid. (Specified in path).
-* __notificationId__ (string)
-One of the notification&#39;s identification which includes name or uuid. (Specified in path).
 
 <h3>Responses</h3>
 
 __200__
 
-* Description: An array of retrieved device&#39;s info.
-* Schema: [Device](#device)
+* Description: An array of complete messages.
+* Schema: [Action](#action)
     
 __default__
 
 * Description: Unexpected error.
 * Schema: [Error](#error)
     
-### Entity Methods
 
-<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/users/{userId}/{relation}</h2>
+<h2 class="usergrid-POST-heading">POST /management/users/resetpw</h2>
 
-Retrieve a user&#39;s collections or connections through query statement.
+Complete the password reset through getting the newpassword and the old one for identification.
 
 <h3>Parameters</h3>
 
-* __orgId__ (string)
-One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-* __appId__ (string)
-One of the application&#39;s identification which includes name or uuid. (Specified in path).
-* __userId-3__ (string)
-One of the user&#39;s identification which includes username or UUID. (Specified in path).
-* __relation__ (string)
-The relation between user and collections. (Specified in path).
-* __queryStatement__ ()
-The query statement of the user. (Specified in query).
+* __ResetPWMsg__ ([ResetPWMsg](#resetpwmsg))
+Parameters and value for the Captcha challenge, the admin user&#39;s response to the Captcha challenge, and the admin user&#39;s email address. (Specified in body).
 
 <h3>Responses</h3>
 
 __200__
 
-* Description: An array of user&#39;s collections info.
-* Schema: [Entity](#entity)
+* Description: An array of complete messages.
+* Schema: [Action](#action)
     
 __default__
 
@@ -542,27 +237,21 @@ __default__
 * Schema: [Error](#error)
     
 
-<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/{collectionId}</h2>
+<h2 class="usergrid-GET-heading">GET /management/users/{userId}</h2>
 
-Retrieve collection through query statement.
+Retrieve details about an admin user.
 
 <h3>Parameters</h3>
 
-* __orgId__ (string)
-One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-* __appId__ (string)
-One of the application&#39;s identification which includes name or uuid. (Specified in path).
-* __collectionId__ (string)
-One of the collection&#39;s identification which includes name or uuid. (Specified in path).
-* __queryStatement__ ()
-Any values specified in the query statement should be enclosed in single-quotes. (Specified in query).
+* __userId__ (string)
+One of the user&#39;s identification which includes username, real name, email address or UUID. (Specified in path).
 
 <h3>Responses</h3>
 
 __200__
 
-* Description: An array of retrieved collection&#39;s info.
-* Schema: [Entity](#entity)
+* Description: An array of user&#39;s details
+* Schema: [User](#user)
     
 __default__
 
@@ -570,27 +259,21 @@ __default__
 * Schema: [Error](#error)
     
 
-<h2 class="usergrid-PUT-heading">PUT /{orgId}/{appId}/{collectionId}</h2>
+<h2 class="usergrid-PUT-heading">PUT /management/users/{userId}</h2>
 
-Update collection through query statement.
+Update the info of an admin user.
 
 <h3>Parameters</h3>
 
-* __orgId__ (string)
-One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-* __appId__ (string)
-One of the application&#39;s identification which includes name or uuid. (Specified in path).
-* __collectionId__ (string)
-One of the collection&#39;s identification which includes name or uuid. (Specified in path).
-* __queryStatement__ ()
-Any values specified in the query statement should be enclosed in single-quotes. (Specified in query).
+* __userId__ (string)
+One of the user&#39;s identification which includes username, real name, email address or UUID. (Specified in path).
 
 <h3>Responses</h3>
 
 __200__
 
-* Description: An array of updated collection&#39;s info.
-* Schema: [Entity](#entity)
+* Description: An array of user&#39;s details.
+* Schema: [User](#user)
     
 __default__
 
@@ -598,31 +281,25 @@ __default__
 * Schema: [Error](#error)
     
 
-<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/{collectionId}/{entityId1}/{relation}/{entityId2}</h2>
+<h2 class="usergrid-GET-heading">GET /management/users/{userId}/activate</h2>
 
-Add an entity to a collection through providing all the identifications.
+Activate an admin user from a link provIded in an email notification.
 
 <h3>Parameters</h3>
 
-* __orgId__ (string)
-One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-* __appId__ (string)
-One of the application&#39;s identification which includes name or uuid. (Specified in path).
-* __collectionId__ (string)
-One of the collection&#39;s identification which includes name or uuid. (Specified in path).
-* __entityId1__ (string)
-The Id of the 1st entity. (Specified in path).
-* __relation__ (string)
-The relation between 1st entity and 2nd entity. (Specified in path).
-* __entityId2__ (string)
-The Id of the 2nd entity. (Specified in path).
+* __userId__ (string)
+One of the user&#39;s identification which includes username, real name, email address or UUID. (Specified in path).
+* __token__ (string)
+Activation token&#39;s query statement. (Specified in query).
+* __confirm_email__ (boolean)
+Query statement of whether send confimation email or not. (Specified in query).
 
 <h3>Responses</h3>
 
 __200__
 
-* Description: An array of added entity&#39;s info.
-* Schema: [Entity](#entity)
+* Description: An array of complete messages.
+* Schema: [Action](#action)
     
 __default__
 
@@ -630,31 +307,23 @@ __default__
 * Schema: [Error](#error)
     
 
-<h2 class="usergrid-DELETE-heading">DELETE /{orgId}/{appId}/{collectionId}/{entityId1}/{relation}/{entityId2}</h2>
+<h2 class="usergrid-PUT-heading">PUT /management/users/{userId}/password</h2>
 
-Remove an entity from a collection through providing all the identifications.
+Update an admin user&#39;s password through getting the newpassword and the old one for identification.
 
 <h3>Parameters</h3>
 
-* __orgId__ (string)
-One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-* __appId__ (string)
-One of the application&#39;s identification which includes name or uuid. (Specified in path).
-* __collectionId__ (string)
-One of the collection&#39;s identification which includes name or uuid. (Specified in path).
-* __entityId1__ (string)
-The Id of the 1st entity. (Specified in path).
-* __relation__ (string)
-The relation between 1st entity and 2nd entity. (Specified in path).
-* __entityId2__ (string)
-The Id of the 2nd entity. (Specified in path).
+* __userId__ (string)
+One of the user&#39;s identification which includes username, real name, email address or UUID. (Specified in path).
+* __ResetPW__ ([ResetPW](#resetpw))
+The user&#39;s old and new password. (Specified in body).
 
 <h3>Responses</h3>
 
 __200__
 
-* Description: An array of deleted entity&#39;s info.
-* Schema: [Entity](#entity)
+* Description: An array of complete messages.
+* Schema: [Action](#action)
     
 __default__
 
@@ -662,37 +331,32 @@ __default__
 * Schema: [Error](#error)
     
 
-<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/{collectionId}/{entityId}</h2>
+<h2 class="usergrid-GET-heading">GET /management/users/{userId}/reactivate</h2>
 
-Retrieve an entity through providing Id of application, organization, collection and entity.
+Reactivate an expired admin user.
 
 <h3>Parameters</h3>
 
-* __orgId__ (string)
-One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-* __appId__ (string)
-One of the application&#39;s identification which includes name or uuid. (Specified in path).
-* __collectionId__ (string)
-One of the collection&#39;s identification which includes name or uuid. (Specified in path).
-* __entityId__ (string)
-One of the entity&#39;s identification which includes name or uuid. (Specified in path).
+* __userId__ (string)
+One of the user&#39;s identification which includes username, real name, email address or UUID. (Specified in path).
 
 <h3>Responses</h3>
 
 __200__
 
-* Description: An array of retrieved entity&#39;s info.
-* Schema: [Entity](#entity)
+* Description: An array of complete messages.
+* Schema: [Action](#action)
     
 __default__
 
 * Description: Unexpected error.
 * Schema: [Error](#error)
     
+### App-Users Methods
 
-<h2 class="usergrid-PUT-heading">PUT /{orgId}/{appId}/{collectionId}/{entityId}</h2>
+<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/users</h2>
 
-One or more properties can be updated with a single request.
+Retrieve users though query statement.
 
 <h3>Parameters</h3>
 
@@ -700,19 +364,15 @@ One or more properties can be updated with a single request.
 One of the organization&#39;s identification which includes name or uuid. (Specified in path).
 * __appId__ (string)
 One of the application&#39;s identification which includes name or uuid. (Specified in path).
-* __collectionId__ (string)
-One of the collection&#39;s identification which includes name or uuid. (Specified in path).
-* __entityId__ (string)
-One of the entity&#39;s identification which includes name or uuid. (Specified in path).
-* __entityproperty__ ([CreateEntities](#createentities))
-The properties of the entity. (Specified in body).
+* __queryStatement__ (string)
+The query statement of the User. (Specified in query).
 
 <h3>Responses</h3>
 
 __200__
 
-* Description: An array of updated entity&#39;s info.
-* Schema: [Entity](#entity)
+* Description: An array of retrieved user&#39;s info.
+* Schema: [User](#user)
     
 __default__
 
@@ -720,9 +380,9 @@ __default__
 * Schema: [Error](#error)
     
 
-<h2 class="usergrid-DELETE-heading">DELETE /{orgId}/{appId}/{collectionId}/{entityId}</h2>
+<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/users</h2>
 
-Delete an entity from the collection.
+Create a user in the users collection through providing all the identifications.
 
 <h3>Parameters</h3>
 
@@ -730,17 +390,15 @@ Delete an entity from the collection.
 One of the organization&#39;s identification which includes name or uuid. (Specified in path).
 * __appId__ (string)
 One of the application&#39;s identification which includes name or uuid. (Specified in path).
-* __collectionId__ (string)
-One of the collection&#39;s identification which includes name or uuid. (Specified in path).
-* __entityId__ (string)
-One of the entity&#39;s identification which includes name or uuid. (Specified in path).
+* __CreateUser__ ([CreateUser](#createuser))
+The properties of the user. (Specified in body).
 
 <h3>Responses</h3>
 
 __200__
 
-* Description: An array of deleted entity&#39;s info.
-* Schema: [Entity](#entity)
+* Description: An array of created user&#39;s info.
+* Schema: [User](#user)
     
 __default__
 
@@ -748,9 +406,9 @@ __default__
 * Schema: [Error](#error)
     
 
-<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/{entitytype}</h2>
+<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/users/{userId}</h2>
 
-When a new entity is created, Usergrid will automatically create a corresponding collection if one does not already exist. The collection will automatically be named with the plural form of the entity type. 
+Retrieve a user through providing all the identifications.
 
 <h3>Parameters</h3>
 
@@ -758,28 +416,25 @@ When a new entity is created, Usergrid will automatically create a corresponding
 One of the organization&#39;s identification which includes name or uuid. (Specified in path).
 * __appId__ (string)
 One of the application&#39;s identification which includes name or uuid. (Specified in path).
-* __entitytype__ (string)
-The entity type to create. (Specified in path).
-* __entityproperty__ ([CreateEntities](#createentities))
-The properties of the entity. (Specified in body).
+* __userId-2__ (string)
+One of the user&#39;s identification which includes username, email address or UUID. (Specified in path).
 
 <h3>Responses</h3>
 
 __200__
 
-* Description: An array of created custom entity&#39;s info.
-* Schema: [Entity](#entity)
+* Description: An array of retrieved user&#39;s info.
+* Schema: [User](#user)
     
 __default__
 
 * Description: Unexpected error.
 * Schema: [Error](#error)
     
-### Event Methods
 
-<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/events</h2>
+<h2 class="usergrid-PUT-heading">PUT /{orgId}/{appId}/users/{userId}</h2>
 
-Create an event through providing both Id of organization and application.
+Update a user through providing all the identifications.
 
 <h3>Parameters</h3>
 
@@ -787,26 +442,25 @@ Create an event through providing both Id of organization and application.
 One of the organization&#39;s identification which includes name or uuid. (Specified in path).
 * __appId__ (string)
 One of the application&#39;s identification which includes name or uuid. (Specified in path).
-* __CreateEvent__ ([CreateEvent](#createevent))
-The required property of the event. (Specified in body).
+* __userId-3__ (string)
+One of the user&#39;s identification which includes username or UUID. (Specified in path).
 
 <h3>Responses</h3>
 
 __200__
 
-* Description: An array of created event&#39;s info.
-* Schema: [Event](#event)
+* Description: An array of updated user&#39;s info.
+* Schema: [User](#user)
     
 __default__
 
 * Description: Unexpected error.
 * Schema: [Error](#error)
     
-### Group Methods
 
-<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/groups</h2>
+<h2 class="usergrid-DELETE-heading">DELETE /{orgId}/{appId}/users/{userId}</h2>
 
-Create a new group through providing both Id of organization and application.
+Remove a user through providing all the identifications.
 
 <h3>Parameters</h3>
 
@@ -814,15 +468,15 @@ Create a new group through providing both Id of organization and application.
 One of the organization&#39;s identification which includes name or uuid. (Specified in path).
 * __appId__ (string)
 One of the application&#39;s identification which includes name or uuid. (Specified in path).
-* __groupproperty__ ([CreateGroup](#creategroup))
-The property of the created group. (Specified in body).
+* __userId-3__ (string)
+One of the user&#39;s identification which includes username or UUID. (Specified in path).
 
 <h3>Responses</h3>
 
 __200__
 
-* Description: An array of created group&#39;s info.
-* Schema: [Group](#group)
+* Description: An array of deleted user&#39;s info.
+* Schema: [User](#user)
     
 __default__
 
@@ -830,9 +484,9 @@ __default__
 * Schema: [Error](#error)
     
 
-<h2 class="usergrid-GET-heading">GET /{org_Id}/{app_Id}/groups/{groupId}</h2>
+<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/users/{user}/password</h2>
 
-Get a group through through providing all the identifications.
+Set a user&#39;s password or reset the user&#39;s existing password.
 
 <h3>Parameters</h3>
 
@@ -840,25 +494,28 @@ Get a group through through providing all the identifications.
 One of the organization&#39;s identification which includes name or uuid. (Specified in path).
 * __appId__ (string)
 One of the application&#39;s identification which includes name or uuid. (Specified in path).
-* __groupId__ (string)
-One of the group&#39;s identification which includes name or uuid. (Specified in path).
+* __username__ (string)
+The username of the user. (Specified in path).
+* __ResetPW__ ([ResetPW](#resetpw))
+The user&#39;s old and new password. (Specified in body).
 
 <h3>Responses</h3>
 
 __200__
 
-* Description: An array of retrieved group&#39;s info.
-* Schema: [Group](#group)
+* Description: An array of complete messages.
+* Schema: [Action](#action)
     
 __default__
 
 * Description: Unexpected error.
 * Schema: [Error](#error)
     
+### Entities-Collections Methods
 
-<h2 class="usergrid-PUT-heading">PUT /{org_Id}/{app_Id}/groups/{groupId}</h2>
+<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/users/{userId}/{relation}</h2>
 
-Update a group through providing all the identifications.
+Retrieve a user&#39;s collections or connections through query statement.
 
 <h3>Parameters</h3>
 
@@ -866,40 +523,47 @@ Update a group through providing all the identifications.
 One of the organization&#39;s identification which includes name or uuid. (Specified in path).
 * __appId__ (string)
 One of the application&#39;s identification which includes name or uuid. (Specified in path).
-* __groupId__ (string)
-One of the group&#39;s identification which includes name or uuid. (Specified in path).
+* __userId-3__ (string)
+One of the user&#39;s identification which includes username or UUID. (Specified in path).
+* __relation__ (string)
+The relation between user and collections. (Specified in path).
+* __queryStatement__ (string)
+The query statement of the user. (Specified in query).
 
 <h3>Responses</h3>
 
 __200__
 
-* Description: An array of updated group&#39;s info.
-* Schema: [Group](#group)
+* Description: An array of user&#39;s collections info.
+* Schema: [Entity](#entity)
     
 __default__
 
 * Description: Unexpected error.
 * Schema: [Error](#error)
     
-### Notification Methods
 
-<h2 class="usergrid-PUT-heading">PUT /my-org/sandbox/notifications/{notificationId}</h2>
+<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/{collectionId}</h2>
 
-Cancel sent notifications through providing the Id of the notification.
+Retrieve collection through query statement.
 
 <h3>Parameters</h3>
 
-* __notificationId__ (string)
-One of the notification&#39;s identification which includes name or uuid. (Specified in path).
-* __cancelMsg__ ([CancelMSG](#cancelmsg))
-Indicete whether is canceled or not. (Specified in body).
+* __orgId__ (string)
+One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+* __appId__ (string)
+One of the application&#39;s identification which includes name or uuid. (Specified in path).
+* __collectionId__ (string)
+One of the collection&#39;s identification which includes name or uuid. (Specified in path).
+* __queryStatement__ (string)
+Any values specified in the query statement should be enclosed in single-quotes. (Specified in query).
 
 <h3>Responses</h3>
 
 __200__
 
-* Description: An array of canceled notification&#39;s info.
-* Schema: [Notification](#notification)
+* Description: An array of retrieved collection&#39;s info.
+* Schema: [Entity](#entity)
     
 __default__
 
@@ -907,9 +571,9 @@ __default__
 * Schema: [Error](#error)
     
 
-<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/devices</h2>
+<h2 class="usergrid-PUT-heading">PUT /{orgId}/{appId}/{collectionId}</h2>
 
-Create notifications for user through targeting by location and providing all the identifications.
+Update collection through query statement.
 
 <h3>Parameters</h3>
 
@@ -917,21 +581,17 @@ Create notifications for user through targeting by location and providing all th
 One of the organization&#39;s identification which includes name or uuid. (Specified in path).
 * __appId__ (string)
 One of the application&#39;s identification which includes name or uuid. (Specified in path).
-* __notification__ ([CreateNotifications](#createnotifications))
-These parameters are used when forming the notification portion of the request. (Specified in body).
-* __scheduleNotification__ ([ScheduleNotification](#schedulenotification))
-To schedule a notification for a later time add the deliver parameter with a UNIX timestamp to the body of your request. (Specified in body).
-* __setExpiration__ ([SetExpiration](#setexpiration))
-If a push service can&#39;t deliver a message to a device and needs to resend it you can set a notification to expire after a certain date/time. (Specified in body).
-* __queryStatement__ ()
-The query statement of the location of the user. (Specified in query).
+* __collectionId__ (string)
+One of the collection&#39;s identification which includes name or uuid. (Specified in path).
+* __queryStatement__ (string)
+Any values specified in the query statement should be enclosed in single-quotes. (Specified in query).
 
 <h3>Responses</h3>
 
 __200__
 
-* Description: An array of created notification&#39;s info.
-* Schema: [Notification](#notification)
+* Description: An array of updated collection&#39;s info.
+* Schema: [Entity](#entity)
     
 __default__
 
@@ -939,9 +599,9 @@ __default__
 * Schema: [Error](#error)
     
 
-<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/devices/*/notifications</h2>
+<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/{collectionId}/{entityId1}/{relation}/{entityId2}</h2>
 
-Create notifications for all devices. This request will target all device entities.
+Add an entity to a collection through providing all the identifications.
 
 <h3>Parameters</h3>
 
@@ -949,19 +609,21 @@ Create notifications for all devices. This request will target all device entiti
 One of the organization&#39;s identification which includes name or uuid. (Specified in path).
 * __appId__ (string)
 One of the application&#39;s identification which includes name or uuid. (Specified in path).
-* __notification__ ([CreateNotifications](#createnotifications))
-These parameters are used when forming the notification portion of the request. (Specified in body).
-* __scheduleNotification__ ([ScheduleNotification](#schedulenotification))
-To schedule a notification for a later time add the deliver parameter with a UNIX timestamp to the body of your request. (Specified in body).
-* __setExpiration__ ([SetExpiration](#setexpiration))
-If a push service can&#39;t deliver a message to a device and needs to resend it you can set a notification to expire after a certain date/time. (Specified in body).
+* __collectionId__ (string)
+One of the collection&#39;s identification which includes name or uuid. (Specified in path).
+* __entityId1__ (string)
+The Id of the 1st entity. (Specified in path).
+* __relation__ (string)
+The relation between 1st entity and 2nd entity. (Specified in path).
+* __entityId2__ (string)
+The Id of the 2nd entity. (Specified in path).
 
 <h3>Responses</h3>
 
 __200__
 
-* Description: An array of created notification&#39;s info.
-* Schema: [Notification](#notification)
+* Description: An array of added entity&#39;s info.
+* Schema: [Entity](#entity)
     
 __default__
 
@@ -969,9 +631,9 @@ __default__
 * Schema: [Error](#error)
     
 
-<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/devices/{deviceId}/notifications</h2>
+<h2 class="usergrid-DELETE-heading">DELETE /{orgId}/{appId}/{collectionId}/{entityId1}/{relation}/{entityId2}</h2>
 
-Create notifications for a single device. This request will target a specific device entity.
+Remove an entity from a collection through providing all the identifications.
 
 <h3>Parameters</h3>
 
@@ -979,21 +641,21 @@ Create notifications for a single device. This request will target a specific de
 One of the organization&#39;s identification which includes name or uuid. (Specified in path).
 * __appId__ (string)
 One of the application&#39;s identification which includes name or uuid. (Specified in path).
-* __deviceId__ (string)
-One of the device&#39;s identification which includes name or uuid. (Specified in path).
-* __notification__ ([CreateNotifications](#createnotifications))
-These parameters are used when forming the notification portion of the request. (Specified in body).
-* __scheduleNotification__ ([ScheduleNotification](#schedulenotification))
-To schedule a notification for a later time add the deliver parameter with a UNIX timestamp to the body of your request. (Specified in body).
-* __setExpiration__ ([SetExpiration](#setexpiration))
-If a push service can&#39;t deliver a message to a device and needs to resend it you can set a notification to expire after a certain date/time. (Specified in body).
+* __collectionId__ (string)
+One of the collection&#39;s identification which includes name or uuid. (Specified in path).
+* __entityId1__ (string)
+The Id of the 1st entity. (Specified in path).
+* __relation__ (string)
+The relation between 1st entity and 2nd entity. (Specified in path).
+* __entityId2__ (string)
+The Id of the 2nd entity. (Specified in path).
 
 <h3>Responses</h3>
 
 __200__
 
-* Description: An array of created notification&#39;s info.
-* Schema: [Notification](#notification)
+* Description: An array of deleted entity&#39;s info.
+* Schema: [Entity](#entity)
     
 __default__
 
@@ -1001,9 +663,9 @@ __default__
 * Schema: [Error](#error)
     
 
-<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/groups/{path}/notifications</h2>
+<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/{collectionId}/{entityId}</h2>
 
-Create notifications for a group. This request will target all users associated with a specific group entity.
+Retrieve an entity through providing Id of application, organization, collection and entity.
 
 <h3>Parameters</h3>
 
@@ -1011,21 +673,17 @@ Create notifications for a group. This request will target all users associated
 One of the organization&#39;s identification which includes name or uuid. (Specified in path).
 * __appId__ (string)
 One of the application&#39;s identification which includes name or uuid. (Specified in path).
-* __path__ (string)
-The path of the group. (Specified in path).
-* __notification__ ([CreateNotifications](#createnotifications))
-These parameters are used when forming the notification portion of the request. (Specified in body).
-* __scheduleNotification__ ([ScheduleNotification](#schedulenotification))
-To schedule a notification for a later time add the deliver parameter with a UNIX timestamp to the body of your request. (Specified in body).
-* __setExpiration__ ([SetExpiration](#setexpiration))
-If a push service can&#39;t deliver a message to a device and needs to resend it you can set a notification to expire after a certain date/time. (Specified in body).
+* __collectionId__ (string)
+One of the collection&#39;s identification which includes name or uuid. (Specified in path).
+* __entityId__ (string)
+One of the entity&#39;s identification which includes name or uuid. (Specified in path).
 
 <h3>Responses</h3>
 
 __200__
 
-* Description: An array of created notification&#39;s info.
-* Schema: [Notification](#notification)
+* Description: An array of retrieved entity&#39;s info.
+* Schema: [Entity](#entity)
     
 __default__
 
@@ -1033,9 +691,9 @@ __default__
 * Schema: [Error](#error)
     
 
-<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/notifications</h2>
+<h2 class="usergrid-PUT-heading">PUT /{orgId}/{appId}/{collectionId}/{entityId}</h2>
 
-Retrieve one or more notifications through providing all the identifications.
+One or more properties can be updated with a single request.
 
 <h3>Parameters</h3>
 
@@ -1043,13 +701,19 @@ Retrieve one or more notifications through providing all the identifications.
 One of the organization&#39;s identification which includes name or uuid. (Specified in path).
 * __appId__ (string)
 One of the application&#39;s identification which includes name or uuid. (Specified in path).
+* __collectionId__ (string)
+One of the collection&#39;s identification which includes name or uuid. (Specified in path).
+* __entityId__ (string)
+One of the entity&#39;s identification which includes name or uuid. (Specified in path).
+* __entityproperty__ ([CreateEntities](#createentities))
+The properties of the entity. (Specified in body).
 
 <h3>Responses</h3>
 
 __200__
 
-* Description: An array of retrieved notification&#39;s info.
-* Schema: [Notification](#notification)
+* Description: An array of updated entity&#39;s info.
+* Schema: [Entity](#entity)
     
 __default__
 
@@ -1057,9 +721,9 @@ __default__
 * Schema: [Error](#error)
     
 
-<h2 class="usergrid-DELETE-heading">DELETE /{orgId}/{appId}/notifications/{notificationId}</h2>
+<h2 class="usergrid-DELETE-heading">DELETE /{orgId}/{appId}/{collectionId}/{entityId}</h2>
 
-Remove unsent notifications through providing all the identifications.
+Delete an entity from the collection.
 
 <h3>Parameters</h3>
 
@@ -1067,15 +731,17 @@ Remove unsent notifications through providing all the identifications.
 One of the organization&#39;s identification which includes name or uuid. (Specified in path).
 * __appId__ (string)
 One of the application&#39;s identification which includes name or uuid. (Specified in path).
-* __notificationId__ (string)
-One of the notification&#39;s identification which includes name or uuid. (Specified in path).
+* __collectionId__ (string)
+One of the collection&#39;s identification which includes name or uuid. (Specified in path).
+* __entityId__ (string)
+One of the entity&#39;s identification which includes name or uuid. (Specified in path).
 
 <h3>Responses</h3>
 
 __200__
 
-* Description: An array of deleted notification&#39;s info.
-* Schema: [Notification](#notification)
+* Description: An array of deleted entity&#39;s info.
+* Schema: [Entity](#entity)
     
 __default__
 
@@ -1083,9 +749,9 @@ __default__
 * Schema: [Error](#error)
     
 
-<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/users/{userId}/notifications</h2>
+<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/{entitytype}</h2>
 
-Create notifications for a user. This request will target a specific user entity.
+When a new entity is created, Usergrid will automatically create a corresponding collection if one does not already exist. The collection will automatically be named with the plural form of the entity type. 
 
 <h3>Parameters</h3>
 
@@ -1093,31 +759,28 @@ Create notifications for a user. This request will target a specific user entity
 One of the organization&#39;s identification which includes name or uuid. (Specified in path).
 * __appId__ (string)
 One of the application&#39;s identification which includes name or uuid. (Specified in path).
-* __userId-3__ (string)
-One of the user&#39;s identification which includes username or UUID. (Specified in path).
-* __notification__ ([CreateNotifications](#createnotifications))
-These parameters are used when forming the notification portion of the request. (Specified in body).
-* __scheduleNotification__ ([ScheduleNotification](#schedulenotification))
-To schedule a notification for a later time add the deliver parameter with a UNIX timestamp to the body of your request. (Specified in body).
-* __setExpiration__ ([SetExpiration](#setexpiration))
-If a push service can&#39;t deliver a message to a device and needs to resend it you can set a notification to expire after a certain date/time. (Specified in body).
+* __entitytype__ (string)
+The entity type to create. (Specified in path).
+* __entityproperty__ ([CreateEntities](#createentities))
+The properties of the entity. (Specified in body).
 
 <h3>Responses</h3>
 
 __200__
 
-* Description: An array of created notification&#39;s info.
-* Schema: [Notification](#notification)
+* Description: An array of created custom entity&#39;s info.
+* Schema: [Entity](#entity)
     
 __default__
 
 * Description: Unexpected error.
 * Schema: [Error](#error)
     
+### Events Methods
 
-<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/{receiptId}/*/notifications</h2>
+<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/events</h2>
 
-Retrieve notifications associated with one or more receipts through providing all the identifications.
+Create an event through providing both Id of organization and application.
 
 <h3>Parameters</h3>
 
@@ -1125,38 +788,42 @@ Retrieve notifications associated with one or more receipts through providing al
 One of the organization&#39;s identification which includes name or uuid. (Specified in path).
 * __appId__ (string)
 One of the application&#39;s identification which includes name or uuid. (Specified in path).
-* __receiptId__ (string)
-One of the receipt&#39;s identification which includes name or uuid. (Specified in path).
+* __CreateEvent__ ([CreateEvent](#createevent))
+The required property of the event. (Specified in body).
 
 <h3>Responses</h3>
 
 __200__
 
-* Description: An array of retrieved notification&#39;s info.
-* Schema: [Notification](#notification)
+* Description: An array of created event&#39;s info.
+* Schema: [Event](#event)
     
 __default__
 
 * Description: Unexpected error.
 * Schema: [Error](#error)
     
-### Organization Methods
+### Groups Methods
 
-<h2 class="usergrid-POST-heading">POST /management/orgs</h2>
+<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/groups</h2>
 
-Create an organization through a form post.
+Create a new group through providing both Id of organization and application.
 
 <h3>Parameters</h3>
 
-* __CreateOrg__ ([CreateOrg](#createorg))
-A set of organization properties supplied through a form. (Specified in body).
+* __orgId__ (string)
+One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+* __appId__ (string)
+One of the application&#39;s identification which includes name or uuid. (Specified in path).
+* __groupproperty__ ([CreateGroup](#creategroup))
+The property of the created group. (Specified in body).
 
 <h3>Responses</h3>
 
 __200__
 
-* Description: An array of created Organization.
-* Schema: [Organization](#organization)
+* Description: An array of created group&#39;s info.
+* Schema: [Group](#group)
     
 __default__
 
@@ -1164,32 +831,37 @@ __default__
 * Schema: [Error](#error)
     
 
-<h2 class="usergrid-GET-heading">GET /management/orgs/{orgId}</h2>
+<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/groups/{groupId}/activities</h2>
 
-Retrieve an organization given a specified UUID or username.
+Create an activity to a specific group. In this case the activity is created in the activities collection and is accessible at the /activities endpoint to users who have the permission to read that endpoint. In addition, a relationship is established between the activity and the group, and because of that, the activity will appear in the group’s feed. The group &#39;owns&#39; the activity. Also, the activity will be published in the feed of all users that are members of the group.
 
 <h3>Parameters</h3>
 
 * __orgId__ (string)
 One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+* __appId__ (string)
+One of the application&#39;s identification which includes name or uuid. (Specified in path).
+* __groupId__ (string)
+One of the group&#39;s identification which includes name or uuid. (Specified in path).
+* __CreateActivity__ ([CreateActivity](#createactivity))
+One or more sets of activity properties. (Specified in body).
 
 <h3>Responses</h3>
 
 __200__
 
-* Description: An array of created Organization.
-* Schema: [Organization](#organization)
+* Description: An array of user&#39;s activity.
+* Schema: [ActivityFeed](#activityfeed)
     
 __default__
 
 * Description: Unexpected error.
 * Schema: [Error](#error)
     
-### Permission Methods
 
-<h2 class="usergrid-DELETE-heading">DELETE /{orgId}/{appId}/roles/{roleId}/permissions</h2>
+<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/groups/{groupId}/users/{userId}</h2>
 
-Remove permissions from a role. 
+Add a user to a group through providing all the identifications.
 
 <h3>Parameters</h3>
 
@@ -1197,28 +869,27 @@ Remove permissions from a role.
 One of the organization&#39;s identification which includes name or uuid. (Specified in path).
 * __appId__ (string)
 One of the application&#39;s identification which includes name or uuid. (Specified in path).
-* __roleId__ (string)
-One of the role&#39;s identification which includes name or uuid. (Specified in path).
-* __grant_url_pattern__ ()
-The query statement of the url pattern. (Specified in query).
+* __groupId__ (string)
+One of the group&#39;s identification which includes name or uuid. (Specified in path).
+* __userId-3__ (string)
+One of the user&#39;s identification which includes username or UUID. (Specified in path).
 
 <h3>Responses</h3>
 
 __200__
 
-* Description: An array of deleted permission&#39;s info.
-* Schema: [Permission](#permission)
+* Description: An array of added user&#39;s info.
+* Schema: [User](#user)
     
 __default__
 
 * Description: Unexpected error.
 * Schema: [Error](#error)
     
-### Receipt Methods
 
-<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/receipts</h2>
+<h2 class="usergrid-DELETE-heading">DELETE /{orgId}/{appId}/groups/{groupId}/users/{userId}</h2>
 
-Retrieve one or more receipts through providing all the identifications.
+Delete user from a group through providing all the identifications.
 
 <h3>Parameters</h3>
 
@@ -1226,13 +897,17 @@ Retrieve one or more receipts through providing all the identifications.
 One of the organization&#39;s identification which includes name or uuid. (Specified in path).
 * __appId__ (string)
 One of the application&#39;s identification which includes name or uuid. (Specified in path).
+* __groupId__ (string)
+One of the group&#39;s identification which includes name or uuid. (Specified in path).
+* __userId-3__ (string)
+One of the user&#39;s identification which includes username or UUID. (Specified in path).
 
 <h3>Responses</h3>
 
 __200__
 
-* Description: An array of retrieved receipt&#39;s info.
-* Schema: [Receipt](#receipt)
+* Description: An array of deleted user&#39;s info.
+* Schema: [User](#user)
     
 __default__
 
@@ -1240,9 +915,9 @@ __default__
 * Schema: [Error](#error)
     
 
-<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/{deviceId}/*/receipts</h2>
+<h2 class="usergrid-GET-heading">GET /{org_Id}/{app_Id}/groups/{groupId}</h2>
 
-Retrieve receipts associated with one or more devices through providing all the identifications.
+Get a group through through providing all the identifications.
 
 <h3>Parameters</h3>
 
@@ -1250,15 +925,15 @@ Retrieve receipts associated with one or more devices through providing all the
 One of the organization&#39;s identification which includes name or uuid. (Specified in path).
 * __appId__ (string)
 One of the application&#39;s identification which includes name or uuid. (Specified in path).
-* __deviceId__ (string)
-One of the device&#39;s identification which includes name or uuid. (Specified in path).
+* __groupId__ (string)
+One of the group&#39;s identification which includes name or uuid. (Specified in path).
 
 <h3>Responses</h3>
 
 __200__
 
-* Description: An array of retrieved receipt&#39;s info.
-* Schema: [Receipt](#receipt)
+* Description: An array of retrieved group&#39;s info.
+* Schema: [Group](#group)
     
 __default__
 
@@ -1266,9 +941,9 @@ __default__
 * Schema: [Error](#error)
     
 
-<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/{notificationId}/*/receipts</h2>
+<h2 class="usergrid-PUT-heading">PUT /{org_Id}/{app_Id}/groups/{groupId}</h2>
 
-Retrieve receipts for one or more notifications through providing all the identifications.&quot;
+Update a group through providing all the identifications.
 
 <h3>Parameters</h3>
 
@@ -1276,40 +951,38 @@ Retrieve receipts for one or more notifications through providing all the identi
 One of the organization&#39;s identification which includes name or uuid. (Specified in path).
 * __appId__ (string)
 One of the application&#39;s identification which includes name or uuid. (Specified in path).
-* __notificationId__ (string)
-One of the notification&#39;s identification which includes name or uuid. (Specified in path).
+* __groupId__ (string)
+One of the group&#39;s identification which includes name or uuid. (Specified in path).
 
 <h3>Responses</h3>
 
 __200__
 
-* Description: An array of retrieved receipt&#39;s info.
-* Schema: [Receipt](#receipt)
+* Description: An array of updated group&#39;s info.
+* Schema: [Group](#group)
     
 __default__
 
 * Description: Unexpected error.
 * Schema: [Error](#error)
     
-### Role Methods
+### Organizations-Applications Methods
 
-<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/roles</h2>
+<h2 class="usergrid-POST-heading">POST /management/orgs</h2>
 
-Retrieve the roles in an application through providing all the identifications.
+Create an organization through a form post.
 
 <h3>Parameters</h3>
 
-* __orgId__ (string)
-One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-* __appId__ (string)
-One of the application&#39;s identification which includes name or uuid. (Specified in path).
+* __CreateOrg__ ([CreateOrg](#createorg))
+A set of organization properties supplied through a form. (Specified in body).
 
 <h3>Responses</h3>
 
 __200__
 
-* Description: An array of retrieved role&#39;s info.
-* Schema: [Role](#role)
+* Description: An array of created Organization.
+* Schema: [Organization](#organization)
     
 __default__
 
@@ -1317,25 +990,21 @@ __default__
 * Schema: [Error](#error)
     
 
-<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/roles</h2>
+<h2 class="usergrid-GET-heading">GET /management/orgs/{orgId}</h2>
 
-Create a new role through providing all the identifications.
+Retrieve an organization given a specified UUID or username.
 
 <h3>Parameters</h3>
 
 * __orgId__ (string)
 One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-* __appId__ (string)
-One of the application&#39;s identification which includes name or uuid. (Specified in path).
-* __roleproperty__ ([AddRole](#addrole))
-The required properties of the role. (Specified in body).
 
 <h3>Responses</h3>
 
 __200__
 
-* Description: An array of created role&#39;s info.
-* Schema: [Role](#role)
+* Description: An array of created Organization.
+* Schema: [Organization](#organization)
     
 __default__
 
@@ -1343,36 +1012,35 @@ __default__
 * Schema: [Error](#error)
     
 
-<h2 class="usergrid-DELETE-heading">DELETE /{orgId}/{appId}/roles/{rolename}</h2>
+<h2 class="usergrid-GET-heading">GET /management/orgs/{orgId}/activate</h2>
 
-Remove a role through providing all the identifications.
+Activate an organization from a link provIded in an email notification.
 
 <h3>Parameters</h3>
 
 * __orgId__ (string)
 One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-* __appId__ (string)
-One of the application&#39;s identification which includes name or uuid. (Specified in path).
-* __rolename__ (string)
-The name of the role. (Specified in path).
+* __token__ (string)
+Activation token. (Specified in query).
+* __confirm_email__ (boolean)
+Send confirmation email or not. (Specified in query).
 
 <h3>Responses</h3>
 
 __200__
 
-* Description: An array of deleted role&#39;s info.
-* Schema: [Role](#role)
+* Description: An array of complete messages.
+* Schema: [Action](#action)
     
 __default__
 
 * Description: Unexpected error.
 * Schema: [Error](#error)
     
-### User Methods
 
-<h2 class="usergrid-GET-heading">GET /management/orgs/{orgId}/users</h2>
+<h2 class="usergrid-GET-heading">GET /management/orgs/{orgId}/apps</h2>
 
-Retrieve details about the admin users in an organization.
+Retrieve the applications in an organization through providing both Id of application and organization.
 
 <h3>Parameters</h3>
 
@@ -1383,8 +1051,8 @@ One of the organization&#39;s identification which includes name or uuid. (Speci
 
 __200__
 
-* Description: An array of retrieved Admin user&#39;s info.
-* Schema: [User](#user)
+* Description: An array of retrieved application data.
+* Schema: [AppData](#appdata)
     
 __default__
 
@@ -1392,23 +1060,23 @@ __default__
 * Schema: [Error](#error)
     
 
-<h2 class="usergrid-DELETE-heading">DELETE /management/orgs/{orgId}/users/{userId}</h2>
+<h2 class="usergrid-GET-heading">GET /management/orgs/{orgId}/apps/{appId}/credentials</h2>
 
-Remove an admin user from an organization through providing both Id of application and organization.
+Retrieve the client Id and client secret credentials for an application in an organization.
 
 <h3>Parameters</h3>
 
 * __orgId__ (string)
 One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-* __userId-2__ (string)
-One of the user&#39;s identification which includes username, email address or UUID. (Specified in path).
+* __appId__ (string)
+One of the application&#39;s identification which includes name or uuid. (Specified in path).
 
 <h3>Responses</h3>
 
 __200__
 
-* Description: An array of deleted Admin user&#39;s info.
-* Schema: [User](#user)
+* Description: An array of retrieved credentials info.
+* Schema: [Credential](#credential)
     
 __default__
 
@@ -1416,21 +1084,23 @@ __default__
 * Schema: [Error](#error)
     
 
-<h2 class="usergrid-POST-heading">POST /management/users</h2>
+<h2 class="usergrid-POST-heading">POST /management/orgs/{orgId}/apps/{appId}/credentials</h2>
 
-Create a whole new admin user.
+Generate the client Id and client secret credentials for an application in an organization.
 
 <h3>Parameters</h3>
 
-* __adminuserproperty__ ([CreateAdminUser](#createadminuser))
-One or more sets of user properties of which username is mandatory and must be unique. (Specified in body).
+* __orgId__ (string)
+One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+* __appId__ (string)
+One of the application&#39;s identification which includes name or uuid. (Specified in path).
 
 <h3>Responses</h3>
 
 __200__
 
-* Description: An array of new created Admin user&#39;s info.
-* Schema: [User](#user)
+* Description: An array of generated credentials info.
+* Schema: [Credential](#credential)
     
 __default__
 
@@ -1438,21 +1108,21 @@ __default__
 * Schema: [Error](#error)
     
 
-<h2 class="usergrid-GET-heading">GET /management/users/{userId}</h2>
+<h2 class="usergrid-GET-heading">GET /management/orgs/{orgId}/credentials</h2>
 
-Retrieve details about an admin user.
+Retrieve the credentials for an organization client.
 
 <h3>Parameters</h3>
 
-* __userId__ (string)
-One of the user&#39;s identification which includes username, real name, email address or UUID. (Specified in path).
+* __orgId__ (string)
+One of the organization&#39;s identification which includes name or uuid. (Specified in path).
 
 <h3>Responses</h3>
 
 __200__
 
-* Description: An array of user&#39;s details
-* Schema: [User](#user)
+* Description: An array of Credential
+* Schema: [Credential](#credential)
     
 __default__
 
@@ -1460,21 +1130,21 @@ __default__
 * Schema: [Error](#error)
     
 
-<h2 class="usergrid-PUT-heading">PUT /management/users/{userId}</h2>
+<h2 class="usergrid-POST-heading">POST /management/orgs/{orgId}/credentials</h2>
 
-Update the info of an admin user.
+Generate whole new credentials for an organization client.
 
 <h3>Parameters</h3>
 
-* __userId__ (string)
-One of the user&#39;s identification which includes username, real name, email address or UUID. (Specified in path).
+* __orgId__ (string)
+One of the organization&#39;s identification which includes name or uuid. (Specified in path).
 
 <h3>Responses</h3>
 
 __200__
 
-* Description: An array of user&#39;s details.
-* Schema: [User](#user)
+* Description: An array of Credential
+* Schema: [Credential](#credential)
     
 __default__
 
@@ -1482,27 +1152,21 @@ __default__
 * Schema: [Error](#error)
     
 
-<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/groups/{groupId}/users/{userId}</h2>
+<h2 class="usergrid-GET-heading">GET /management/orgs/{orgId}/feed</h2>
 
-Add a user to a group through providing all the identifications.
+Retrieve an organization&#39;s activity feed.
 
 <h3>Parameters</h3>
 
 * __orgId__ (string)
 One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-* __appId__ (string)
-One of the application&#39;s identification which includes name or uuid. (Specified in path).
-* __groupId__ (string)
-One of the group&#39;s identification which includes name or uuid. (Specified in path).
-* __userId-3__ (string)
-One of the user&#39;s identification which includes username or UUID. (Specified in path).
 
 <h3>Responses</h3>
 
 __200__
 
-* Description: An array of added user&#39;s info.
-* Schema: [User](#user)
+* Description: An array of the organization&#39;s ActivityFeed.
+* Schema: [ActivityFeed](#activityfeed)
     
 __default__
 
@@ -1510,27 +1174,21 @@ __default__
 * Schema: [Error](#error)
     
 
-<h2 class="usergrid-DELETE-heading">DELETE /{orgId}/{appId}/groups/{groupId}/users/{userId}</h2>
+<h2 class="usergrid-GET-heading">GET /management/orgs/{orgId}/reactivate</h2>
 
-Delete user from a group through providing all the identifications.
+Reactivate an expired organization.
 
 <h3>Parameters</h3>
 
 * __orgId__ (string)
 One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-* __appId__ (string)
-One of the application&#39;s identification which includes name or uuid. (Specified in path).
-* __groupId__ (string)
-One of the group&#39;s identification which includes name or uuid. (Specified in path).
-* __userId-3__ (string)
-One of the user&#39;s identification which includes username or UUID. (Specified in path).
 
 <h3>Responses</h3>
 
 __200__
 
-* Description: An array of deleted user&#39;s info.
-* Schema: [User](#user)
+* Description: An array of complete messages.
+* Schema: [Action](#action)
     
 __default__
 
@@ -1538,35 +1196,32 @@ __default__
 * Schema: [Error](#error)
     
 
-<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/roles/{roleId}/users</h2>
+<h2 class="usergrid-GET-heading">GET /management/users/{userId}/feed</h2>
 
-Retrieve the users in a role through providing all the identifications.
+Retrieve an admin user&#39;s activity feed.
 
 <h3>Parameters</h3>
 
-* __orgId__ (string)
-One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-* __appId__ (string)
-One of the application&#39;s identification which includes name or uuid. (Specified in path).
-* __roleId__ (string)
-One of the role&#39;s identification which includes name or uuid. (Specified in path).
+* __userId__ (string)
+One of the user&#39;s identification which includes username, real name, email address or UUID. (Specified in path).
 
 <h3>Responses</h3>
 
 __200__
 
-* Description: An array of retrieved user&#39;s info.
-* Schema: [User](#user)
+* Description: An array of user&#39;s activity
+* Schema: [ActivityFeed](#activityfeed)
     
 __default__
 
 * Description: Unexpected error.
 * Schema: [Error](#error)
     
+### Permissions-Roles Methods
 
-<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/roles/{roleId}/users/{userId}</h2>
+<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/roles</h2>
 
-Add a user to a role through providing all the identifications.
+Retrieve the roles in an application through providing all the identifications.
 
 <h3>Parameters</h3>
 
@@ -1574,17 +1229,13 @@ Add a user to a role through providing all the identifications.
 One of the organization&#39;s identification which includes name or uuid. (Specified in path).
 * __appId__ (string)
 One of the application&#39;s identification which includes name or uuid. (Specified in path).
-* __roleId__ (string)
-One of the role&#39;s identification which includes name or uuid. (Specified in path).
-* __userId-3__ (string)
-One of the user&#39;s identification which includes username or UUID. (Specified in path).
 
 <h3>Responses</h3>
 
 __200__
 
-* Description: An array of added user&#39;s info.
-* Schema: [User](#user)
+* Description: An array of retrieved role&#39;s info.
+* Schema: [Role](#role)
     
 __default__
 
@@ -1592,9 +1243,9 @@ __default__
 * Schema: [Error](#error)
     
 
-<h2 class="usergrid-DELETE-heading">DELETE /{orgId}/{appId}/roles/{roleId}/users/{userId}</h2>
+<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/roles</h2>
 
-Remove a user from a role through providing all the identifications.
+Create a new role through providing all the identifications.
 
 <h3>Parameters</h3>
 
@@ -1602,17 +1253,15 @@ Remove a user from a role through providing all the identifications.
 One of the organization&#39;s identification which includes name or uuid. (Specified in path).
 * __appId__ (string)
 One of the application&#39;s identification which includes name or uuid. (Specified in path).
-* __roleId__ (string)
-One of the role&#39;s identification which includes name or uuid. (Specified in path).
-* __userId-3__ (string)
-One of the user&#39;s identification which includes username or UUID. (Specified in path).
+* __roleproperty__ ([AddRole](#addrole))
+The required properties of the role. (Specified in body).
 
 <h3>Responses</h3>
 
 __200__
 
-* Description: An array of deleted user&#39;s info.
-* Schema: [User](#user)
+* Description: An array of created role&#39;s info.
+* Schema: [Role](#role)
     
 __default__
 
@@ -1620,9 +1269,9 @@ __default__
 * Schema: [Error](#error)
     
 
-<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/users</h2>
+<h2 class="usergrid-DELETE-heading">DELETE /{orgId}/{appId}/roles/{roleId}/permissions</h2>
 
-Retrieve users though query statement.
+Remove permissions from a role. 
 
 <h3>Parameters</h3>
 
@@ -1630,15 +1279,17 @@ Retrieve users though query statement.
 One of the organization&#39;s identification which includes name or uuid. (Specified in path).
 * __appId__ (string)
 One of the application&#39;s identification which includes name or uuid. (Specified in path).
-* __queryStatement__ ()
-The query statement of the User. (Specified in query).
+* __roleId__ (string)
+One of the role&#39;s identification which includes name or uuid. (Specified in path).
+* __grant_url_pattern__ (string)
+The query statement of the url pattern. (Specified in query).
 
 <h3>Responses</h3>
 
 __200__
 
-* Description: An array of retrieved user&#39;s info.
-* Schema: [User](#user)
+* Description: An array of deleted permission&#39;s info.
+* Schema: [Permission](#permission)
     
 __default__
 
@@ -1646,9 +1297,9 @@ __default__
 * Schema: [Error](#error)
     
 
-<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/users</h2>
+<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/roles/{roleId}/users</h2>
 
-Create a user in the users collection through providing all the identifications.
+Retrieve the users in a role through providing all the identifications.
 
 <h3>Parameters</h3>
 
@@ -1656,14 +1307,14 @@ Create a user in the users collection through providing all the identifications.
 One of the organization&#39;s identification which includes name or uuid. (Specified in path).
 * __appId__ (string)
 One of the application&#39;s identification which includes name or uuid. (Specified in path).
-* __CreateUser__ ([CreateUser](#createuser))
-The properties of the user. (Specified in body).
+* __roleId__ (string)
+One of the role&#39;s identification which includes name or uuid. (Specified in path).
 
 <h3>Responses</h3>
 
 __200__
 
-* Description: An array of created user&#39;s info.
+* Description: An array of retrieved user&#39;s info.
 * Schema: [User](#user)
     
 __default__
@@ -1672,9 +1323,9 @@ __default__
 * Schema: [Error](#error)
     
 
-<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/users/{userId}</h2>
+<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/roles/{roleId}/users/{userId}</h2>
 
-Retrieve a user through providing all the identifications.
+Add a user to a role through providing all the identifications.
 
 <h3>Parameters</h3>
 
@@ -1682,14 +1333,16 @@ Retrieve a user through providing all the identifications.
 One of the organization&#39;s identification which includes name or uuid. (Specified in path).
 * __appId__ (string)
 One of the application&#39;s identification which includes name or uuid. (Specified in path).
-* __userId-2__ (string)
-One of the user&#39;s identification which includes username, email address or UUID. (Specified in path).
+* __roleId__ (string)
+One of the role&#39;s identification which includes name or uuid. (Specified in path).
+* __userId-3__ (string)
+One of the user&#39;s identification which includes username or UUID. (Specified in path).
 
 <h3>Responses</h3>
 
 __200__
 
-* Description: An array of retrieved user&#39;s info.
+* Description: An array of added user&#39;s info.
 * Schema: [User](#user)
     
 __default__
@@ -1698,9 +1351,9 @@ __default__
 * Schema: [Error](#error)
     
 
-<h2 class="usergrid-PUT-heading">PUT /{orgId}/{appId}/users/{userId}</h2>
+<h2 class="usergrid-DELETE-heading">DELETE /{orgId}/{appId}/roles/{roleId}/users/{userId}</h2>
 
-Update a user through providing all the identifications.
+Remove a user from a role through providing all the identifications.
 
 <h3>Parameters</h3>
 
@@ -1708,6 +1361,8 @@ Update a user through providing all the identifications.
 One of the organization&#39;s identification which includes name or uuid. (Specified in path).
 * __appId__ (string)
 One of the application&#39;s identification which includes name or uuid. (Specified in path).
+* __roleId__ (string)
+One of the role&#39;s identification which includes name or uuid. (Specified in path).
 * __userId-3__ (string)
 One of the user&#39;s identification which includes username or UUID. (Specified in path).
 
@@ -1715,7 +1370,7 @@ One of the user&#39;s identification which includes username or UUID. (Specified
 
 __200__
 
-* Description: An array of updated user&#39;s info.
+* Description: An array of deleted user&#39;s info.
 * Schema: [User](#user)
     
 __default__
@@ -1724,9 +1379,9 @@ __default__
 * Schema: [Error](#error)
     
 
-<h2 class="usergrid-DELETE-heading">DELETE /{orgId}/{appId}/users/{userId}</h2>
+<h2 class="usergrid-DELETE-heading">DELETE /{orgId}/{appId}/roles/{rolename}</h2>
 
-Remove a user through providing all the identifications.
+Remove a role through providing all the identifications.
 
 <h3>Parameters</h3>
 
@@ -1734,15 +1389,15 @@ Remove a user through providing all the identifications.
 One of the organization&#39;s identification which includes name or uuid. (Specified in path).
 * __appId__ (string)
 One of the application&#39;s identification which includes name or uuid. (Specified in path).
-* __userId-3__ (string)
-One of the user&#39;s identification which includes username or UUID. (Specified in path).
+* __rolename__ (string)
+The name of the role. (Specified in path).
 
 <h3>Responses</h3>
 
 __200__
 
-* Description: An array of deleted user&#39;s info.
-* Schema: [User](#user)
+* Description: An array of deleted role&#39;s info.
+* Schema: [Role](#role)
     
 __default__
 
@@ -1753,6 +1408,37 @@ __default__
 ## Models
 Properties for Usergrid default entities.
 
+### AccessTokenResponse
+
+__Properties__ 
+
+<table width="80%" class="usergrid-table">
+    <tr>
+        <th>Name</th>
+        <th>Type</th>
+        <th>Description</th>
+        <th>Required</th>
+    </tr>
+    <tr>
+        <td>access_token</td>
+        <td>string</td>
+        <td>Access-token that may be used on subsequent requests.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>expires_in</td>
+        <td>number</td>
+        <td>Time (in milliseconds) until access-token expires.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>user</td>
+        <td>ref</td>
+        <td>User object if login was done as a user.</td>
+        <td>false</td>
+    </tr>
+</table>
+
 ### Action
 
 __Properties__ 
@@ -2638,6 +2324,49 @@ __Properties__
     </tr>
 </table>
 
+### LoginCredentials
+
+__Properties__ 
+
+<table width="80%" class="usergrid-table">
+    <tr>
+        <th>Name</th>
+        <th>Type</th>
+        <th>Description</th>
+        <th>Required</th>
+    </tr>
+    <tr>
+        <td>grant_type</td>
+        <td>string</td>
+        <td>Grant-type must be &#39;password&#39; or &#39;client_credentials&#39;.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>username</td>
+        <td>string</td>
+        <td>Username of user attempting login, required only if grant_type is &#39;password&#39;.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>password</td>
+        <td>string</td>
+        <td>Password of user attempting login, required only if grant_type is &#39;password&#39;.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>client_id</td>
+        <td>string</td>
+        <td>Client-ID portion of credentials, required only if grant_type is &#39;client_credentials&#39;.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>client_secret</td>
+        <td>string</td>
+        <td>Client-Secret portion of credentials, required only if grant_type is &#39;client_credentials&#39;.</td>
+        <td>false</td>
+    </tr>
+</table>
+
 ### Metadata
 
 __Properties__ 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c4116fa2/docs/security-and-auth/using-permissions.md
----------------------------------------------------------------------
diff --git a/docs/security-and-auth/using-permissions.md b/docs/security-and-auth/using-permissions.md
index 34ec664..600e09a 100644
--- a/docs/security-and-auth/using-permissions.md
+++ b/docs/security-and-auth/using-permissions.md
@@ -47,7 +47,7 @@ org	        Organization UUID or organization name
 app	        Application UUID or application name
 collection	The collection of the entity that the permissions are to be assigned to. 
 entity	    The UUID of the entity to assign the permissions to. For users, username and for groups, name are also accepted.
-permissions	The permissions to assign to the entity. See Permissions syntax for format.
+permissions	The permissions to assign to the entity. See [Permissions syntax](security-and-auth/using-permissions.html#permissions-syntax) for format.
 
 For collections, Valid values are users and groups.
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c4116fa2/docs/user-management/activity.md
----------------------------------------------------------------------
diff --git a/docs/user-management/activity.md b/docs/user-management/activity.md
index 2703ab8..f477be8 100644
--- a/docs/user-management/activity.md
+++ b/docs/user-management/activity.md
@@ -131,13 +131,13 @@ The ``/users/me`` endpoint is accessible only if you provide an access token wit
 
 When you create an activity it creates a relationship between the activity and the user who created it. In other words, the newly created activity above belongs to john.doe. Another way of saying this is the user "owns" the activity. And because this relationship exists, the activity will appear in the feed of any of the user’s followers (in this example, anyone who is following john.doe). However, it will not appear in the feed of people the user follows. The activity is accessible at the ``/activities`` endpoint to users who have the permission to read that endpoint.
 
-Notice the properties specified in the request body in the previous example are actor, verb, and content. The actor, verb, and content properties are built into the Activity entity (see Default Data Entity Types). The actor property specifies properties of the entity that performs the action (here, user john.doe). The gravatar URL is used to create an icon for the activity. And because an Activity is simply an API Services data entity, you can also create custom properties.
+Notice the properties specified in the request body in the previous example are actor, verb, and content. The actor, verb, and content properties are built into the Activity entity (see [Activity entity properties](../rest-endpoints/api-doc.html#activity) ). The actor property specifies properties of the entity that performs the action (here, user john.doe). The gravatar URL is used to create an icon for the activity. And because an Activity is simply an API Services data entity, you can also create custom properties.
 
 The verb parameter is descriptive. You can use it to indicate what type of activity is posted, for example, an image versus text. The value post is defined in the JSON Activity Streams specification as “the act of authoring an object and then publishing it online.“
 
 ## Posting an activity to a group
 
-Use the POST method to post an activity to a specific group. In this case the activity is created in the activities collection and is accessible at the /activities endpoint to users who have the permission to read that endpoint. In addition, a relationship is established between the activity and the group, and because of that, the activity will appear in the group’s feed. The group "owns" the activity. Also, the activity will be published in the feed of all users that are members of the group.
+Use the POST method to post an activity to a specific group. In this case the activity is created in the activities collection and is accessible at the ``/activities`` endpoint to users who have the permission to read that endpoint. In addition, a relationship is established between the activity and the group, and because of that, the activity will appear in the group’s feed. The group "owns" the activity. Also, the activity will be published in the feed of all users that are members of the group.
 
 ### Request URI
 
@@ -223,7 +223,7 @@ When you create an activity for a user’s followers in a group:
 
 The activity is accessible at the ``/activities`` endpoint to users who have the permission to read that endpoint. The activity will not be cross-posted to the group’s activity endpoint (``/groups/{uuid|groupname}/activities``)
 A relationship is automatically created between the activity entity that was just created and the user within that group (``/groups/{uuid|groupname}/users/{uuid|username}``)
-The user within the group (``/groups/{uuid|groupname}/users/{uuid|username}```) becomes the owner of the activity (through the owner property in the activity).
+The user within the group (``/groups/{uuid|groupname}/users/{uuid|username}``) becomes the owner of the activity (through the owner property in the activity).
 
 ### Request URI
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c4116fa2/docs/user-management/group.md
----------------------------------------------------------------------
diff --git a/docs/user-management/group.md b/docs/user-management/group.md
index 4f76cb6..a48606b 100644
--- a/docs/user-management/group.md
+++ b/docs/user-management/group.md
@@ -10,7 +10,7 @@ See the [Group Model section of the API Reference](../rest-endpoints/api-docs.ht
 
 ## Creating groups
 
-A group entity represents an application group of users. You can create, retrieve, update, delete, and query group entities. See User entity properties for a list of the system-defined  properties for group entities. In addition, you can create group properties specific to your application.
+A group entity represents an application group of users. You can create, retrieve, update, delete, and query group entities. See [User entity properties](../rest-endpoints/api-doc.html#user) for a list of the system-defined  properties for group entities. In addition, you can create group properties specific to your application.
 
 ### Request Syntax
 
@@ -39,7 +39,7 @@ The ``path`` property is required and must be unique, it may include forward sla
 
 ### Example
 
-__Note__: Although not shown in the API examples below, you need to provide a valid access token with each API call. See Authenticating users and application clients for details.
+__Note__: Although not shown in the API examples below, you need to provide a valid access token with each API call. See [Authenticating users and application clients](../security-and-auth/authenticating-users-and-application-clients.html) for details.
 
 ### Request
 
@@ -104,7 +104,7 @@ Parameter	Description
 org_id | uuid	  Organization UUID or organization name
 app_id | uuid	  Application UUID or application name
 groupPath | uuid  Group UUID or group path, which must be unique.
-query_string      A data store query. For more on queries, see Data queries.
+query_string      A data store query. For more on queries, see [Data queries](../data-queries/querying-your-data.html).
 
 ### Request
 
@@ -225,11 +225,9 @@ For more information and code samples, see [Deleting Data Entities](../data-stor
 
 ## Adding a user to a group
 
-See all application entities  
-
 You can add users to groups from client code using cURL commands or one of the SDKs, as described here.
 
-When setting up your application on the server, you might find it easier and more convenient to create and populate groups with the admin portal. There, you can create groups, create roles, and define permission rules that govern user access to data and services in your application. For more information, see Security & token authentication.
+When setting up your application on the server, you might find it easier and more convenient to create and populate groups with the admin portal. There, you can create groups, create roles, and define permission rules that govern user access to data and services in your application. For more information, see [Security & Token Authentication](../security-and-auth/app-security.html).
 
 Use the POST method to add a user to a group. If the named group does not yet exist, an error message is returned.
 
@@ -252,7 +250,7 @@ arg uuid | string username	UUID or username of user
 
 ### Example
 
-__Note__: Although not shown in the API examples below, you need to provide a valid access token with each API call. See Authenticating users and application clients for details.
+__Note__: Although not shown in the API examples below, you need to provide a valid access token with each API call. See [Authenticating users and application clients](../security-and-auth/authenticating-users-and-application-clients.html) for details.
 
 ### Request
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c4116fa2/docs/user-management/messagee-example.md
----------------------------------------------------------------------
diff --git a/docs/user-management/messagee-example.md b/docs/user-management/messagee-example.md
index eb3e560..1401d8c 100644
--- a/docs/user-management/messagee-example.md
+++ b/docs/user-management/messagee-example.md
@@ -8,7 +8,7 @@ There are three client versions of Messagee:
 * [An Android client version](https://github.com/apigee/usergrid-sample-android-messagee)
 * [An HTML5 client](https://github.com/apigee/usergrid-sample-html5-messagee)
 
-The sections below describe how to create a new app, enter some test users, and run the app. You also learn how to use the Usergrid admin portal, a user interface that streamlines data and application management in the Usergrid system. The portal is also a reference application that shows how to incorporate Usergrid APIs with JavaScript. For a more detailed discussion of the portal's functionality, see Admin portal.
+The sections below describe how to create a new app, enter some test users, and run the app. You also learn how to use the Usergrid admin portal, a user interface that streamlines data and application management in the Usergrid system. The portal is also a reference application that shows how to incorporate Usergrid APIs with JavaScript. 
 
 ## Creating a user account in Usergrid
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c4116fa2/docs/user-management/working-user-data.md
----------------------------------------------------------------------
diff --git a/docs/user-management/working-user-data.md b/docs/user-management/working-user-data.md
index a7603fd..5e2b63d 100644
--- a/docs/user-management/working-user-data.md
+++ b/docs/user-management/working-user-data.md
@@ -1,7 +1,7 @@
 # Working with User Data
 You can store and manage user data as User entities. With user data in your application, you can add support for a wide variety of features common to mobile apps. For example, you can:
 
-* Control access to data by defining permission rules. (See Security & token authentication for more.)
+* Control access to data by defining permission rules. (See [Security & token authentication](../security-and-auth/app-security.html) for more.)
 * Present content specific to each user, such as their list of favorites.
 * Support social features, such as letting users "follow" one another, for example.
 
@@ -9,7 +9,7 @@ In mobile applications, data about users is typically added by users themselves
 
 ## Creating users
 
-A user entity represents an application user. Using API Services you can create, retrieve, update, delete, and query user entities. See User entity properties for a list of the system-defined  properties for user entities. In addition, you can create user properties specific to your application.
+A user entity represents an application user. Using API Services you can create, retrieve, update, delete, and query user entities. See [User entity properties](../rest-endpoints/api-doc.html#user) for a list of the system-defined  properties for user entities. In addition, you can create user properties specific to your application.
 
 ### Request Syntax
 
@@ -38,13 +38,13 @@ The username is mandatory and must be unique. Here's an example:
         "password" : "test1234"
     }
 
-Although the password parameter is not mandatory, if you don't specify it, the user will not be able to log in using username and password credentials. If a password is not specified for the user, and you're an Admin, you can set a password for the user (see Setting a password).
+Although the password parameter is not mandatory, if you don't specify it, the user will not be able to log in using username and password credentials. If a password is not specified for the user, and you're an Admin, you can set a password for the user (see [Changing a User Password](#changing-a-user-password)).
 
 __ Note__: The username can contain any combination of characters, including those that represent letters, numbers, and symbols.
 
 ### Example
 
-__Note__: Although not shown in the API examples below, you need to provide a valid access token with each API call. See Authenticating users and application clients for details.
+__Note__: Although not shown in the API examples below, you need to provide a valid access token with each API call. See [Authenticating users and application clients](../security-and-auth/authenticating-users-and-application-clients.html) for details.
 
 ### Request
 
@@ -96,7 +96,7 @@ __Note__: Although not shown in the API examples below, you need to provide a va
 
 You can retrieve data about users through cURL or one of the SDKs. Each provides a way to filter the list of users by data associated with the user, such as username or UUID, or other properties in the user entity.
 
-See User entity properties for a list of the system-defined  properties for user entities. In addition, you can create user properties specific to your application.
+See [User entity properties](../rest-endpoints/api-doc.html#user) for a list of the system-defined  properties for user entities. In addition, you can create user properties specific to your application.
 
 ### Request Syntax
 
@@ -116,7 +116,7 @@ uuid | org_id	Organization UUID or organization name
 uuid | app_id	Application UUID or application name
 user identifier User UUID, username, or email address. 
 
-The alias ``/users/me`` can be used in place of the current user’s uuid, username, or email address. Note: The ``/users/me`` endpoint is accessible only if you provide an access token with the request (see Authenticating users and application clients). If you make an anonymous ("guest") call, the system will not be able to determine which user to return as /users/me.
+The alias ``/users/me`` can be used in place of the current user’s uuid, username, or email address. Note: The ``/users/me`` endpoint is accessible only if you provide an access token with the request (see [Authenticating users and application clients](../security-and-auth/authenticating-users-and-application-clients.html)). If you make an anonymous ("guest") call, the system will not be able to determine which user to return as ``/users/me``.
 
 __Note__: The username can contain any combination of characters, including those that represent letters, numbers, and symbols.
 

[24/60] [abbrv] incubator-usergrid git commit: cherry picking docs from master

[sn...@apache.org]

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/counters-and-events/creating-and-incrementing-counters.html
----------------------------------------------------------------------
diff --git a/content/docs/counters-and-events/creating-and-incrementing-counters.html b/content/docs/counters-and-events/creating-and-incrementing-counters.html
new file mode 100644
index 0000000..511a0e3
--- /dev/null
+++ b/content/docs/counters-and-events/creating-and-incrementing-counters.html
@@ -0,0 +1,406 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>Creating &amp; incrementing counters &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+        <link rel="next" title="Retrieving counters" href="retrieving-counters.html"/>
+        <link rel="prev" title="Counters &amp; events" href="events-and-counters.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">Creating &amp; incrementing counters</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#request-syntax">Request syntax</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#example-request">Example request</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#example-response">Example response</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>Creating &amp; incrementing counters</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/counters-and-events/creating-and-incrementing-counters.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="creating-incrementing-counters">
+<h1>Creating &amp; incrementing counters<a class="headerlink" href="#creating-incrementing-counters" title="Permalink to this headline">¶</a></h1>
+<p>To create a new counter or increment an existing counter, include the
+counter property in the body of a POST to the /events endpoint. More
+than one counter can be incremented in the same request.</p>
+<p><strong>Note</strong>: It may take up to 30 seconds after an event has been posted
+for the counter to be incremented.</p>
+<div class="section" id="request-syntax">
+<h2>Request syntax<a class="headerlink" href="#request-syntax" title="Permalink to this headline">¶</a></h2>
+<div class="highlight-python"><div class="highlight"><pre>curl -X POST https://api.usergrid.com/&lt;org&gt;/&lt;app&gt;/events -d &#39;{&quot;timestamp&quot;:&lt;timestamp&gt;, &quot;counters&quot; : {&lt;counter_name&gt;:&lt;increment_value&gt;}}&#39;
+</pre></div>
+</div>
+<p>Parameters</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="19%" />
+<col width="81%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>org</td>
+<td>Organization UUID or organization name</td>
+</tr>
+<tr class="row-odd"><td>app</td>
+<td>Application UUID or application name</td>
+</tr>
+<tr class="row-even"><td>timestamp</td>
+<td>A required UNIX timestamp that specifies the time the counter is being incremented.</td>
+</tr>
+<tr class="row-odd"><td>counter_name</td>
+<td>The name of the counter to create or the existing counter to increment.</td>
+</tr>
+<tr class="row-even"><td>increment_value</td>
+<td>The value to increment the counter by.</td>
+</tr>
+</tbody>
+</table>
+<p>Regarding the <code class="docutils literal"><span class="pre">increment_value</span></code>, a negative number can be specified to
+decrement the value. A value of &#8216;0&#8217; can be specified to reset the value
+of the counter.</p>
+<p>For the <code class="docutils literal"><span class="pre">timestamp</span></code>, specifying a value of 0 will automatically assign
+the current time.</p>
+</div>
+<div class="section" id="example-request">
+<h2>Example request<a class="headerlink" href="#example-request" title="Permalink to this headline">¶</a></h2>
+<p>The following request will increment the &#8216;button_clicks&#8217; counter by
+one, with a timestamp of the current time.</p>
+<div class="highlight-python"><div class="highlight"><pre>curl -X POST https://api.usergrid.com/your-org/your-app/events -d &#39;{&quot;timestamp&quot;:0, &quot;counters&quot; : {&quot;button_clicks&quot;:1}}&#39;
+</pre></div>
+</div>
+</div>
+<div class="section" id="example-response">
+<h2>Example response<a class="headerlink" href="#example-response" title="Permalink to this headline">¶</a></h2>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+  <span class="s">&quot;action&quot;</span> <span class="p">:</span> <span class="s">&quot;post&quot;</span><span class="p">,</span>
+  <span class="s">&quot;application&quot;</span> <span class="p">:</span> <span class="s">&quot;f34f4222-a166-11e2-a7f7-02e81adcf3d0&quot;</span><span class="p">,</span>
+  <span class="s">&quot;params&quot;</span> <span class="p">:</span> <span class="p">{</span> <span class="p">},</span>
+  <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span class="s">&quot;/events&quot;</span><span class="p">,</span>
+  <span class="s">&quot;uri&quot;</span> <span class="p">:</span> <span class="s">&quot;https://api.usergrid.com/your-org/your-app/events&quot;</span><span class="p">,</span>
+  <span class="s">&quot;entities&quot;</span> <span class="p">:</span> <span class="p">[</span> <span class="p">{</span>
+    <span class="s">&quot;uuid&quot;</span> <span class="p">:</span> <span class="s">&quot;b11217fc-9d3a-1427-b24e-699740088e05&quot;</span><span class="p">,</span>
+    <span class="s">&quot;type&quot;</span> <span class="p">:</span> <span class="s">&quot;event&quot;</span><span class="p">,</span>
+    <span class="s">&quot;created&quot;</span> <span class="p">:</span> <span class="mi">1401224590293</span><span class="p">,</span>
+    <span class="s">&quot;modified&quot;</span> <span class="p">:</span> <span class="mi">1401224590293</span><span class="p">,</span>
+    <span class="s">&quot;timestamp&quot;</span> <span class="p">:</span> <span class="mi">1401224590293</span><span class="p">,</span>
+    <span class="s">&quot;counters&quot;</span> <span class="p">:</span> <span class="p">{</span>
+      <span class="s">&quot;button_clicks&quot;</span> <span class="p">:</span> <span class="mi">1</span>
+    <span class="p">},</span>
+    <span class="s">&quot;message&quot;</span> <span class="p">:</span> <span class="n">null</span><span class="p">,</span>
+    <span class="s">&quot;metadata&quot;</span> <span class="p">:</span> <span class="p">{</span>
+      <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span class="s">&quot;/events/b11217fc-9d3a-1427-b24e-699740088e05&quot;</span>
+    <span class="p">}</span>
+  <span class="p">}</span> <span class="p">],</span>
+  <span class="s">&quot;timestamp&quot;</span> <span class="p">:</span> <span class="mi">1401224590291</span><span class="p">,</span>
+  <span class="s">&quot;duration&quot;</span> <span class="p">:</span> <span class="mi">30</span><span class="p">,</span>
+  <span class="s">&quot;organization&quot;</span> <span class="p">:</span> <span class="s">&quot;your-org&quot;</span><span class="p">,</span>
+  <span class="s">&quot;applicationName&quot;</span> <span class="p">:</span> <span class="s">&quot;your-app&quot;</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+</div>
+<div class="section" id="decrementing-resetting-counters">
+<h1>Decrementing/resetting counters<a class="headerlink" href="#decrementing-resetting-counters" title="Permalink to this headline">¶</a></h1>
+<p>To decrement a counter, specify a negative number for the counter value
+in any of the above examples.</p>
+<p>To reset a counter, specify a value of 0 for the counter value in any of
+the above examples.</p>
+<p>Note that the Usergrid JavaScript SDK also provides dedicated methods
+for decrementing and resetting counters.</p>
+</div>
+<div class="section" id="using-counters-hierarchically">
+<h1>Using counters hierarchically<a class="headerlink" href="#using-counters-hierarchically" title="Permalink to this headline">¶</a></h1>
+<p>You can organize counters into hierarchies by giving them dot-separated
+names, e.g. <code class="docutils literal"><span class="pre">button_clicks.homepage</span></code>. Incrementing a counter lower in
+a hierarchy increments all of the counters upward in the hierarchy
+chain.</p>
+<p>For example, you want to log errors that your app generates, so you
+create hierarchical counters for each module and function within that
+module. In this example, you create the following set of counters:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">errors</span>
+<span class="n">errors</span><span class="o">.</span><span class="n">module</span>
+<span class="n">errors</span><span class="o">.</span><span class="n">module</span><span class="o">.</span><span class="n">function</span>
+</pre></div>
+</div>
+<p>Incrementing <code class="docutils literal"><span class="pre">errors.module.function</span></code> by 1 increments all three
+counters by 1. A hierarchy can be a useful way of easily tracking
+actions in your app at both a cumulative and granular level.</p>
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+      
+        <a href="retrieving-counters.html" class="btn btn-neutral float-right" title="Retrieving counters" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+      
+      
+        <a href="events-and-counters.html" class="btn btn-neutral" title="Counters &amp; events" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+      
+    </div>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/counters-and-events/events-and-counters.html
----------------------------------------------------------------------
diff --git a/content/docs/counters-and-events/events-and-counters.html b/content/docs/counters-and-events/events-and-counters.html
new file mode 100644
index 0000000..d759fc5
--- /dev/null
+++ b/content/docs/counters-and-events/events-and-counters.html
@@ -0,0 +1,303 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>Counters &amp; events &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+        <link rel="next" title="Creating &amp; incrementing counters" href="creating-and-incrementing-counters.html"/>
+        <link rel="prev" title="Folders" href="../asset-and-files/folders.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul class="current">
+<li class="toctree-l1 current"><a class="current reference internal" href="">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>Counters &amp; events</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/counters-and-events/events-and-counters.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="counters-events">
+<h1>Counters &amp; events<a class="headerlink" href="#counters-events" title="Permalink to this headline">¶</a></h1>
+<p>Counters can be used to track statistics on many aspects of an
+application by keeping a running count of the number of times an action
+occurs in your app. Posting an event increments the counter. Counters
+can also be retrieved by time period, allowing you to generate reports
+on specific actions in your app.</p>
+<p>With Usergrid, you can define your own counters. Some of the things that
+you might track with a user-defined counter are:</p>
+<ul class="simple">
+<li>How many times people click on the help button in your application.</li>
+<li>How many times your game is played each day.</li>
+<li>How many times your banner ads are clicked each day.</li>
+</ul>
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+      
+        <a href="creating-and-incrementing-counters.html" class="btn btn-neutral float-right" title="Creating &amp; incrementing counters" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+      
+      
+        <a href="../asset-and-files/folders.html" class="btn btn-neutral" title="Folders" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+      
+    </div>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/counters-and-events/retrieving-counters.html
----------------------------------------------------------------------
diff --git a/content/docs/counters-and-events/retrieving-counters.html b/content/docs/counters-and-events/retrieving-counters.html
new file mode 100644
index 0000000..9eff15a
--- /dev/null
+++ b/content/docs/counters-and-events/retrieving-counters.html
@@ -0,0 +1,458 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>Retrieving counters &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+        <link rel="next" title="Organization &amp; application management" href="../orgs-and-apps/managing.html"/>
+        <link rel="prev" title="Creating &amp; incrementing counters" href="creating-and-incrementing-counters.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">Retrieving counters</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#request-syntax">Request syntax</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#example-request">Example request</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#example-response">Example response</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#retrieving-counters-by-time-interval">Retrieving counters by time interval</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#id1">Request syntax</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#id2">Example request</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#id3">Example response</a></li>
+</ul>
+</li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>Retrieving counters</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/counters-and-events/retrieving-counters.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="retrieving-counters">
+<h1>Retrieving counters<a class="headerlink" href="#retrieving-counters" title="Permalink to this headline">¶</a></h1>
+<p>To retrieve a counter, do the following:</p>
+<div class="section" id="request-syntax">
+<h2>Request syntax<a class="headerlink" href="#request-syntax" title="Permalink to this headline">¶</a></h2>
+<div class="highlight-python"><div class="highlight"><pre>curl -X GET https://api.usergrid.com/counters?counter=&lt;counter_name&gt;
+</pre></div>
+</div>
+<p>Parameters</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="28%" />
+<col width="72%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>counter_name</td>
+<td>The name of the counter to be retrieved.</td>
+</tr>
+</tbody>
+</table>
+<p>More than one counter can be retrieved with a single request by
+appending additional counter parameters to the request URI.</p>
+</div>
+<div class="section" id="example-request">
+<h2>Example request<a class="headerlink" href="#example-request" title="Permalink to this headline">¶</a></h2>
+<div class="highlight-python"><div class="highlight"><pre>curl -X GET https://api.usergrid.com/my-org/my-app/counters?counter=button_clicks
+</pre></div>
+</div>
+</div>
+<div class="section" id="example-response">
+<h2>Example response<a class="headerlink" href="#example-response" title="Permalink to this headline">¶</a></h2>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+  <span class="s">&quot;action&quot;</span> <span class="p">:</span> <span class="s">&quot;get&quot;</span><span class="p">,</span>
+  <span class="s">&quot;application&quot;</span> <span class="p">:</span> <span class="s">&quot;f34f4222-a166-11e2-a7f7-02e81adcf3d0&quot;</span><span class="p">,</span>
+  <span class="s">&quot;params&quot;</span> <span class="p">:</span> <span class="p">{</span>
+    <span class="s">&quot;counter&quot;</span> <span class="p">:</span> <span class="p">[</span> <span class="s">&quot;button_clicks&quot;</span> <span class="p">]</span>
+  <span class="p">},</span>
+  <span class="s">&quot;uri&quot;</span> <span class="p">:</span> <span class="s">&quot;https://api.usergrid.com/your-org/your-app&quot;</span><span class="p">,</span>
+  <span class="s">&quot;entities&quot;</span> <span class="p">:</span> <span class="p">[</span> <span class="p">],</span>
+  <span class="s">&quot;timestamp&quot;</span> <span class="p">:</span> <span class="mi">1401310084096</span><span class="p">,</span>
+  <span class="s">&quot;duration&quot;</span> <span class="p">:</span> <span class="mi">21</span><span class="p">,</span>
+  <span class="s">&quot;organization&quot;</span> <span class="p">:</span> <span class="s">&quot;your-org&quot;</span><span class="p">,</span>
+  <span class="s">&quot;applicationName&quot;</span> <span class="p">:</span> <span class="s">&quot;your-app&quot;</span><span class="p">,</span>
+  <span class="s">&quot;count&quot;</span> <span class="p">:</span> <span class="mi">0</span><span class="p">,</span>
+  <span class="s">&quot;counters&quot;</span> <span class="p">:</span> <span class="p">[</span> <span class="p">{</span>
+    <span class="s">&quot;name&quot;</span> <span class="p">:</span> <span class="s">&quot;button_clicks&quot;</span><span class="p">,</span>
+    <span class="s">&quot;values&quot;</span> <span class="p">:</span> <span class="p">[</span> <span class="p">{</span>
+      <span class="s">&quot;timestamp&quot;</span> <span class="p">:</span> <span class="mi">1</span><span class="p">,</span>
+      <span class="s">&quot;value&quot;</span> <span class="p">:</span> <span class="mi">9</span>
+    <span class="p">}</span> <span class="p">]</span>
+  <span class="p">}</span> <span class="p">]</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="retrieving-counters-by-time-interval">
+<h2>Retrieving counters by time interval<a class="headerlink" href="#retrieving-counters-by-time-interval" title="Permalink to this headline">¶</a></h2>
+<p>Knowing the value of a counter is useful; however, you often need to
+know how the value varies over time. Fortunately, the API provides a
+method for you to view this data over any time interval or level of
+granularity.</p>
+<p>For example, let’s say you’re incrementing a counter every time someone
+launches your application. You might be interested in which days of the
+week the application sees the most usage. Using the API, you can examine
+the counter over a set of weeks, with the data split into daily
+intervals. Using this information, you can see which are your peak days
+of usage. You can also view usage across a single day, so you can see if
+your application is used more in the mornings or the evenings.</p>
+</div>
+<div class="section" id="id1">
+<h2>Request syntax<a class="headerlink" href="#id1" title="Permalink to this headline">¶</a></h2>
+<div class="highlight-python"><div class="highlight"><pre>curl -X GET https://api.usergrid.com/counters?start_time=&lt;timestamp&gt;&amp;end_time=&lt;timestamp&gt;&amp;resolution=&lt;resolution&gt;&amp;counter=&lt;counter_name&gt;
+</pre></div>
+</div>
+<p>Parameters</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="26%" />
+<col width="74%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>start_time</td>
+<td>The beginning of the time period to search</td>
+</tr>
+<tr class="row-odd"><td>end_time</td>
+<td>The end of the time period to search</td>
+</tr>
+<tr class="row-even"><td>resolution</td>
+<td>The interval at which counters are displayed.</td>
+</tr>
+<tr class="row-odd"><td>counter_name</td>
+<td>The name of the counter to be retrieved.</td>
+</tr>
+</tbody>
+</table>
+<p>The following resolutions are supported:</p>
+<ul class="simple">
+<li>all</li>
+<li>minute</li>
+<li>five_minutes</li>
+<li>half_hour</li>
+<li>hour</li>
+<li>six_day</li>
+<li>day</li>
+<li>week</li>
+<li>month</li>
+</ul>
+<p>For example, if the interval is day, and the start time and end time
+values span 4 days, you will get aggregate counts for each of the 4
+days.</p>
+</div>
+<div class="section" id="id2">
+<h2>Example request<a class="headerlink" href="#id2" title="Permalink to this headline">¶</a></h2>
+<p>For example, to retrieve a time range of values, with a granularity of
+&#8220;day&#8221;, for a counter called &#8220;button_clicks&#8221;, the GET request would look
+like this:</p>
+<div class="highlight-python"><div class="highlight"><pre>curl -X GET https://api.usergrid.com/my-org/my-app/counters?start_time=1315119600000&amp;end_time=1315724400000&amp;resolution=day&amp;counter=button_clicks
+</pre></div>
+</div>
+</div>
+<div class="section" id="id3">
+<h2>Example response<a class="headerlink" href="#id3" title="Permalink to this headline">¶</a></h2>
+<div class="highlight-python"><div class="highlight"><pre>{
+ action: &quot;get&quot;,
+    uri: &quot;http://api.usergrid.com/438a1ca1-cf9b-11e0-bcc1-12313f0204bb/counters&quot;,
+    timestamp: 1315354369272,
+    duration: 28,
+    counters: [
+        {
+            name: &quot;button_clicks&quot;,
+            values: [
+                {
+                    value: 2
+                    timestamp: 1315180800000
+                },
+                {
+                    value: 1
+                    timestamp: 1315267200000
+                },
+                {
+                    value: 1
+                    timestamp: 1315353600000
+                }
+            ]
+        }
+    ]
+}
+</pre></div>
+</div>
+</div>
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+      
+        <a href="../orgs-and-apps/managing.html" class="btn btn-neutral float-right" title="Organization &amp; application management" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+      
+      
+        <a href="creating-and-incrementing-counters.html" class="btn btn-neutral" title="Creating &amp; incrementing counters" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+      
+    </div>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/data-queries/advanced-query-usage.html
----------------------------------------------------------------------
diff --git a/content/docs/data-queries/advanced-query-usage.html b/content/docs/data-queries/advanced-query-usage.html
new file mode 100644
index 0000000..7c1bfc1
--- /dev/null
+++ b/content/docs/data-queries/advanced-query-usage.html
@@ -0,0 +1,321 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>Advanced query usage &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+        <link rel="next" title="Connecting entities" href="../entity-connections/connecting-entities.html"/>
+        <link rel="prev" title="Query operators &amp; data types" href="operators-and-types.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">Advanced query usage</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#attaching-a-query-to-all-api-calls">Attaching a query to all API calls</a></li>
+</ul>
+</li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>Advanced query usage</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/data-queries/advanced-query-usage.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="advanced-query-usage">
+<h1>Advanced query usage<a class="headerlink" href="#advanced-query-usage" title="Permalink to this headline">¶</a></h1>
+<div class="admonition note"> <p class="first admonition-title"><p>Note</p>
+  </p> <p class="last">
+
+
+Query examples in this content are shown unencoded to make them easier<p>to read. Keep in mind that you might need to encode query strings if
+you&#8217;re sending them as part of URLs, such as when you&#8217;re executing them
+with the cURL tool.</p>
+</p></div><div class="section" id="attaching-a-query-to-all-api-calls">
+<h2>Attaching a query to all API calls<a class="headerlink" href="#attaching-a-query-to-all-api-calls" title="Permalink to this headline">¶</a></h2>
+<div class="admonition note"> <p class="first admonition-title"><p>Note</p>
+</p> <p class="last"><p><p>JavaScript SDK only.</p>
+</p><p>In some cases, it may be convenient to attach a query or other URI
+parameter to every call you make to Usergrid, such as a custom
+identifier or token. To do this with the Usergrid JavaScript SDK, add a
+qs property to your Usergrid.Client object when you initialize the SDK.
+For more on initializing the SDK, see our install guide.</p>
+</p></div><p>For example, the following would append ?custom_id=1234 to every call
+sent from the Usergrid JavaScript SDK to Usergrid:</p>
+<div class="highlight-python"><div class="highlight"><pre>var options = {
+    orgName:&#39;yourOrg&#39;,
+    appName:&#39;yourApp&#39;,
+    qs:&#39;custom_id=1234&#39;
+}
+var dataClient = new Usergrid.Client(options);
+</pre></div>
+</div>
+</div>
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+      
+        <a href="../entity-connections/connecting-entities.html" class="btn btn-neutral float-right" title="Connecting entities" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+      
+      
+        <a href="operators-and-types.html" class="btn btn-neutral" title="Query operators &amp; data types" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+      
+    </div>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

[48/60] [abbrv] incubator-usergrid git commit: Complete Using Roles conversion to Markdown.

[sn...@apache.org]

Complete Using Roles conversion to Markdown.

(cherry picked from commit c886d1f2d7c70a55d83046371b4dbf96dc8aafe3)


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/d54b0fb6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/d54b0fb6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/d54b0fb6

Branch: refs/heads/two-dot-o-dev
Commit: d54b0fb614926adbe4f8c108353fbcb753419e99
Parents: c3fb331
Author: Dave Johnson <sn...@apache.org>
Authored: Thu Aug 6 12:40:08 2015 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Wed Aug 12 13:02:46 2015 -0400

----------------------------------------------------------------------
 docs/security-and-auth/using-roles.md | 183 +++++++++++++++--------------
 1 file changed, 97 insertions(+), 86 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d54b0fb6/docs/security-and-auth/using-roles.md
----------------------------------------------------------------------
diff --git a/docs/security-and-auth/using-roles.md b/docs/security-and-auth/using-roles.md
index 3428405..6404edb 100644
--- a/docs/security-and-auth/using-roles.md
+++ b/docs/security-and-auth/using-roles.md
@@ -1,10 +1,10 @@
 # Using roles
-Roles are named sets of one or more permissions, and are useful for defining specific access levels to resources in your API BaaS data store. Multiple roles can be assigned to a user or group, giving you a great deal of flexibility in how access to resources are defined.
+Roles are named sets of one or more permissions, and are useful for defining specific access levels to resources in your Usergrid data store. Multiple roles can be assigned to a user or group, giving you a great deal of flexibility in how access to resources are defined.
 
 For example, in a blogging app you might create a 'reviewer' role that allows GET and PUT access to an articles collection to allow the user to retrieve and update articles, but not allow them to create new articles.
 
 ## Default roles
-While you can create as many custom roles as you want per application, all API BaaS applications include three default roles. These roles each serve a special purpose and should not be deleted; however, you can and should adjust the permissions assigned to these roles to suit the needs of you app.
+While you can create as many custom roles as you want per application, all Usegrid applications include three default roles. These roles each serve a special purpose and should not be deleted; however, you can and should adjust the permissions assigned to these roles to suit the needs of you app.
 
 The following table describes each pre-defined role, and the permissions that are assigned to them by default.
 
@@ -39,54 +39,28 @@ The following table describes each pre-defined role, and the permissions that ar
   </td>
   <td>
   
- Default for authenticated users. Assigns the associated permissions to all users whose requests are authenticated with a valid access token.
+Default for authenticated users. Assigns the associated permissions to all users whose requests are authenticated with a valid access token.
 
- <div class="admonition warning"> <p class="first admonition-title">WARNING</p> <p class="last">

- __Note__: By default, __grants full access for all resources in your application__. A first task in securing your application should be to restrict access by redefining this role to narrow the access it provides. Remove the default full permission rule and add restrictive permission rules for a production deployment. 
- </p></div>
+<div class="admonition warning"> <p class="first admonition-title">WARNING</p> <p class="last">

+By default, __grants full access for all resources in your application__. A first task in securing your application should be to restrict access by redefining this role to narrow the access it provides. Remove the default full permission rule and add restrictive permission rules for a production deployment. 
+</p></div>
   
   </td>
 </tr>
 <tr>
   <td>Administrator</td>
-  <td></td>
-  <td></td>
-</tr>
-<tr>
-  <td></td>
-  <td></td>
-  <td></td>
-</tr>
-<tr>
-  <td></td>
-  <td></td>
-  <td></td>
+  <td>None</td>
+  <td>
+ 
+Unused until you associate it with users or groups. By default, includes no permissions that provide access. Grants no access. Consider this a blank slate. Add permission rules and associate this role with users and groups as needed.
+<div class="admonition note"> <p class="first admonition-title">NOTE</p> <p class="last">

+The Administrator role is <i>not</i> the same as an organization administrator, that is, someone who authenticates as an Admin User. The Admin User is an implicit user created when you create an organization. After authenticating, the Admin User has full access to all of the administration features of the Usergrid API. By comparison, the Administrator role is simply a role (initially without permissions) that can be assigned to any user.
+</p></div> 
+  
+  </td>
 </tr>
 </table>
 
-Role	Permissions	Description
-Guest	
-post: /devices
-post: /users
-put: /devices/*
-Assigned to all unauthenticated requests. Includes a basic set of permissions that are commonly needed by unregistered or unauthenticated users.
-
-Grants permission for a user to create a user account and for their device to be registered.
-
-Default	
-get, post, put, delete: /**
-Default for authenticated users. Assigns the associated permissions to all users whose requests are authenticated with a valid access token.
-
-By default, grants full access for all resources in your application. A first task in securing your application should be to restrict access by redefining this role to narrow the access it provides. Remove the default full permission rule and add restrictive permission rules for a production deployment.
-Administrator	
-None
-
-Unused until you associate it with users or groups. By default, includes no permissions that provide access.
-
-Grants no access. Consider this a blank slate. Add permission rules and associate this role with users and groups as needed.
-
-Note: The Administrator role is not the same as an organization administrator -- that is, someone who authenticates as an Admin User. The Admin User is an implicit user created when you create an organization. After authenticating, the Admin User has full access to all of the administration features of the API BaaS API. By comparison, the Administrator role is simply a role (initially without permissions) that can be assigned to any user.
-
 ## Creating roles
 Generally, it is easiest to a create a role for each access type you want to enable in your app. You may, however, assign multiple roles to any user or group entity, so you have the flexibility to define any schema for applying roles that you like.
 
@@ -144,6 +118,18 @@ roleName  The name of the role to be created
       "organization" : "your-org",
       "applicationName" : "your-app"
     }		
+    
+    
+### Creating Roles in the Admin Portal
+
+1. In the left sidebar of the Usergrid portal, click Users > Roles. This displays the roles defined for the application.
+Click the '+' button.
+2. In the dialog box, provide a 'title' and 'role name.' A title is an alias for the role name.
+3. Click 'Create'. The role will be created, but will not have any permissions assigned to it.
+4. Click the role you created in the list.
+5. Click the 'Add permissions' button.
+6. In the dialog box, click the check boxes for the HTTP methods you want to grant permissions for, and enter the resource path in the 'Path' field.
+7. The 'Inactivity' field lets you control automatic user logout during periods of inactivity. Set a number of seconds of inactivity before users assigned to this role are automatically logged out.
 		
 ## Assigning roles
 Once you have created some roles, you will need to explicitly assign them to a user or group entity. The permissions associated with that role will be granted to the entity immediately for any requests they send that are authenticated by a valid access token. Please note that assigning a role to a group will grant the associated permissions to every user in that group.
@@ -172,51 +158,65 @@ For groups, the 'name' property can be used. For users, the 'username' property
     
 
 ### Example response
-{
-  "action" : "post",
-  "application" : "f34f4222-a166-11e2-a7f7-02e81adcf3d0",
-  "params" : { },
-  "path" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users",
-  "uri" : "https://api.usergrid.com/your-org/your-app/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users",
-  "entities" : [ {
-    "uuid" : "410b213a-b379-11e3-a0e5-9953085ea376",
-    "type" : "user",
-    "name" : "someUser",
-    "created" : 1395681911491,
-    "modified" : 1399070010291,
-    "username" : "someUser",
-    "activated" : true,
-    "file" : "fobnszewobnioerabnoiawegbrn\n",    
-    "metadata" : {
-      "connecting" : {
-        "friends" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/connecting/friends",
-        "likes" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/connecting/likes"
-      },
-      "path" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376",
-      "sets" : {
-        "rolenames" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/roles",
-        "permissions" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/permissions"
-      },
-      "connections" : {
-        "completed" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/completed",
-        "follows" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/follows"
-      },
-      "collections" : {
-        "activities" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/activities",
-        "devices" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/devices",
-        "feed" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/feed",
-        "groups" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/groups",
-        "roles" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/roles",
-        "following" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/following",
-        "followers" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/followers"
-      }
-    }
-  } ],
-  "timestamp" : 1402965083889,
-  "duration" : 41,
-  "organization" : "your-org",
-  "applicationName" : "your-app"
-}		
+
+    {
+      "action" : "post",
+      "application" : "f34f4222-a166-11e2-a7f7-02e81adcf3d0",
+      "params" : { },
+      "path" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users",
+      "uri" : "https://api.usergrid.com/your-org/your-app/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users",
+      "entities" : [ {
+        "uuid" : "410b213a-b379-11e3-a0e5-9953085ea376",
+        "type" : "user",
+        "name" : "someUser",
+        "created" : 1395681911491,
+        "modified" : 1399070010291,
+        "username" : "someUser",
+        "activated" : true,
+        "file" : "fobnszewobnioerabnoiawegbrn\n",    
+        "metadata" : {
+          "connecting" : {
+            "friends" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/connecting/friends",
+            "likes" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/connecting/likes"
+          },
+          "path" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376",
+          "sets" : {
+            "rolenames" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/roles",
+            "permissions" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/permissions"
+          },
+          "connections" : {
+            "completed" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/completed",
+            "follows" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/follows"
+          },
+          "collections" : {
+            "activities" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/activities",
+            "devices" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/devices",
+            "feed" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/feed",
+            "groups" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/groups",
+            "roles" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/roles",
+            "following" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/following",
+            "followers" : "/roles/348388de-a5c5-3c1e-9de5-9efc8ad529d8/users/410b213a-b379-11e3-a0e5-9953085ea376/followers"
+          }
+        }
+      } ],
+      "timestamp" : 1402965083889,
+      "duration" : 41,
+      "organization" : "your-org",
+      "applicationName" : "your-app"
+    }		
+    
+    
+### Assigning Roles in the Admin Portal
+
+The easiest way to assign roles to user or group entities is to use the 'Users' tab of the Usergrid admin portal, by doing the following:
+
+1. In the left sidebar of the admin portal, click Users > Users or Users > Groups to display either the list of users or groups in your application.
+2. In the list, click the name of the user or group entity you want to assign roles to to display its details in the right pane.
+3. Click the 'Roles & Permissions' tab above the right pane.
+4. Click the 'Add Role' button.
+5. In the popup, select a role from the drop down menu.
+6. Click the 'Add' button.
+
 		
 ## Removing roles
 At times it may be necessary to remove a role from a user or group entity, for example if a user changes jobs, or the duties of a group are altered. Please note that removing a role from a group will remove the associated permissions from every user in that group.
@@ -290,4 +290,15 @@ For groups, the 'name' property can be used. For users, the 'username' property
       "organization" : "your-org",
       "applicationName" : "your-app"
     }	
+    
+### Removing Roles in the Admin Portal
+
+The easiest way to remove roles from user or group entities is to use the 'Users' tab of the Usergrid admin portal, by doing the following:
+
+1. In the left sidebar of the Usergrid admin portal, click Users > Users or Users > Groups to display either the list of users or groups in your application.
+2. In the list, click the name of the user or group entity you want to remove roles from to display its details in the right pane.
+3. Click the 'Roles & Permissions' tab above the right pane.
+4. Click the role you created in the list.
+5. Under 'Roles', click the checkbox beside the role you want to remove from the entity.
+6. Click the 'Leave roles' button.
     
\ No newline at end of file

[16/60] [abbrv] incubator-usergrid git commit: cherry picking docs from master

[sn...@apache.org]

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/installation/ug1-launcher-quick-start.html
----------------------------------------------------------------------
diff --git a/content/docs/installation/ug1-launcher-quick-start.html b/content/docs/installation/ug1-launcher-quick-start.html
new file mode 100644
index 0000000..5ae2501
--- /dev/null
+++ b/content/docs/installation/ug1-launcher-quick-start.html
@@ -0,0 +1,388 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>Usegrid 1: Launcher Quick-start &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+        <link rel="next" title="Usergrid 2: Deploy to Tomcat" href="ug2-deploy-to-tomcat.html"/>
+        <link rel="prev" title="Usegrid 1: Deploying to Tomcat" href="ug1-deploy-to-tomcat.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">Usegrid 1: Launcher Quick-start</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#requirements">Requirements</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#download">Download</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#download2">Download2</a><ul>
+<li class="toctree-l4"><a class="reference internal" href="#building-3">Building 3</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#running">Running</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#getting-started-with-the-http-api">Getting Started with the HTTP API</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>Usegrid 1: Launcher Quick-start</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/installation/ug1-launcher-quick-start.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="usegrid-1-launcher-quick-start">
+<h1>Usegrid 1: Launcher Quick-start<a class="headerlink" href="#usegrid-1-launcher-quick-start" title="Permalink to this headline">¶</a></h1>
+<div class="section" id="requirements">
+<h2>Requirements<a class="headerlink" href="#requirements" title="Permalink to this headline">¶</a></h2>
+<ul class="simple">
+<li><a class="reference external" href="http://www.oracle.com/technetwork/java/javase/downloads/index.html">JDK
+1.7</a></li>
+<li><a class="reference external" href="http://maven.apache.org/">Maven</a></li>
+</ul>
+</div>
+<div class="section" id="download">
+<h2>Download<a class="headerlink" href="#download" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="download2">
+<h3>Download2<a class="headerlink" href="#download2" title="Permalink to this headline">¶</a></h3>
+<p>Start by <a class="reference external" href="https://github.com/apache/incubator-usergrid/archive/master.zip">downloading our latest
+code</a>
+and extract it.</p>
+<div class="section" id="building-3">
+<h4>Building 3<a class="headerlink" href="#building-3" title="Permalink to this headline">¶</a></h4>
+<p>From the command line, navigate to stack directory and type the
+following:</p>
+<div class="highlight-python"><div class="highlight"><pre>mvn clean install -DskipTests=true
+</pre></div>
+</div>
+</div>
+</div>
+</div>
+<div class="section" id="running">
+<h2>Running<a class="headerlink" href="#running" title="Permalink to this headline">¶</a></h2>
+<p>Usergrid-core contains the persistence layer and shared utilities for
+powering the Usergrid service. The services layer is contained in
+usergrid-services and exposes a higher-level API that&#8217;s used by the
+usergrid-rest web services tier.</p>
+<p>You can run Usergrid from the command-line from the jar in the
+usergrid/standalone project:</p>
+<div class="highlight-python"><div class="highlight"><pre>cd launcher; java -jar target/usergrid-launcher-*.jar
+</pre></div>
+</div>
+<p>After startup, your instance will be available on localhost, port 8080.
+To check it’s running properly, you can try loading our status page:</p>
+<div class="highlight-python"><div class="highlight"><pre>curl http://localhost:8080/status
+</pre></div>
+</div>
+<p>You can also run it as a webapp in Tomcat, by deploying the ROOT.war
+file generated in the usergrid/rest project.</p>
+</div>
+<div class="section" id="getting-started-with-the-http-api">
+<h2>Getting Started with the HTTP API<a class="headerlink" href="#getting-started-with-the-http-api" title="Permalink to this headline">¶</a></h2>
+<p>Start by creating an Organization. It’s the top-level structure in
+Usergrid: all Apps and Administrators must belong to an Organization.
+Here’s how you create one:</p>
+<div class="highlight-python"><div class="highlight"><pre>curl -X POST  \
+     -d &#39;organization=myfirstorg&amp;username=myadmin&amp;name=Admin&amp;email=admin@example.com&amp;password=password&#39; \
+     http://localhost:8080/management/organizations
+</pre></div>
+</div>
+<p>You can see that creating an Organization creates an Administrator in
+the process. Let’s authenticate as him:</p>
+<div class="highlight-python"><div class="highlight"><pre>curl &#39;http://localhost:8080/management/token?grant_type=password&amp;username=myadmin&amp;password=password&#39;
+</pre></div>
+</div>
+<p>This will return an access_token. We’ll use this to authenticate the
+next two calls. Next, let’s create an Application:</p>
+<div class="highlight-python"><div class="highlight"><pre>curl -H &quot;Authorization: Bearer [the management token from above]&quot; \
+     -H &quot;Content-Type: application/json&quot; \
+     -X POST -d &#39;{ &quot;name&quot;:&quot;myapp&quot; }&#39; \
+     http://localhost:8080/management/orgs/myfirstorg/apps
+</pre></div>
+</div>
+<p>… And a User for the Application:</p>
+<div class="highlight-python"><div class="highlight"><pre>curl -H &quot;Authorization: Bearer [the management token from above]&quot; \
+     -X POST &quot;http://localhost:8080/myfirstorg/myapp/users&quot; \
+     -d &#39;{ &quot;username&quot;:&quot;myuser&quot;, &quot;password&quot;:&quot;mypassword&quot;, &quot;email&quot;:&quot;user@example.com&quot; }&#39;
+</pre></div>
+</div>
+<p>Let’s now generate an access token for this Application User:</p>
+<div class="highlight-python"><div class="highlight"><pre>curl &#39;http://localhost:8080/myfirstorg/myapp/token?grant_type=password&amp;username=myuser&amp;password=mypassword&#39;
+</pre></div>
+</div>
+<p>This will also send back an access_token, but limited in scope. Let’s
+use it to create a collection with some data in it:</p>
+<div class="highlight-python"><div class="highlight"><pre>curl -H &quot;Authorization: Bearer [the user token]&quot; \
+     -X POST -d &#39;[ { &quot;cat&quot;:&quot;fluffy&quot; }, { &quot;fish&quot;: { &quot;gold&quot;:2, &quot;oscar&quot;:1 } } ]&#39; \
+     http://localhost:8080/myfirstorg/myapp/pets
+</pre></div>
+</div>
+</div>
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+      
+        <a href="ug2-deploy-to-tomcat.html" class="btn btn-neutral float-right" title="Usergrid 2: Deploy to Tomcat" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+      
+      
+        <a href="ug1-deploy-to-tomcat.html" class="btn btn-neutral" title="Usegrid 1: Deploying to Tomcat" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+      
+    </div>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/installation/ug2-deploy-to-tomcat.html
----------------------------------------------------------------------
diff --git a/content/docs/installation/ug2-deploy-to-tomcat.html b/content/docs/installation/ug2-deploy-to-tomcat.html
new file mode 100644
index 0000000..1557115
--- /dev/null
+++ b/content/docs/installation/ug2-deploy-to-tomcat.html
@@ -0,0 +1,509 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>Usergrid 2: Deploy to Tomcat &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+        <link rel="next" title="Presentations &amp; Videos" href="../reference/presos-and-videos.html"/>
+        <link rel="prev" title="Usegrid 1: Launcher Quick-start" href="ug1-launcher-quick-start.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">Usergrid 2: Deploy to Tomcat</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#requirements">Requirements</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#running">Running</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#running-usergrid">Running Usergrid</a><ul>
+<li class="toctree-l4"><a class="reference internal" href="#build-the-java-sdk">Build The Java Sdk</a></li>
+<li class="toctree-l4"><a class="reference internal" href="#build-the-stack-itself">Build The Stack Itself</a></li>
+<li class="toctree-l4"><a class="reference internal" href="#deploying-the-stack-locally">Deploying the Stack Locally</a></li>
+<li class="toctree-l4"><a class="reference internal" href="#running-the-portal-locally">Running The Portal Locally</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#example-usergrid-deployment-properties-file">Example <strong>usergrid-deployment.properties</strong> file</a></li>
+</ul>
+</li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>Usergrid 2: Deploy to Tomcat</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/installation/ug2-deploy-to-tomcat.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="usergrid-2-deploy-to-tomcat">
+<h1>Usergrid 2: Deploy to Tomcat<a class="headerlink" href="#usergrid-2-deploy-to-tomcat" title="Permalink to this headline">¶</a></h1>
+<p><strong>NOTE</strong>: Beware that Usergrid 2 is UNRELEASED SOFTWARE</p>
+<div class="section" id="requirements">
+<h2>Requirements<a class="headerlink" href="#requirements" title="Permalink to this headline">¶</a></h2>
+<ul class="simple">
+<li><a class="reference external" href="http://www.oracle.com/technetwork/java/javase/downloads/index.html">JDK
+1.8</a></li>
+<li><a class="reference external" href="http://maven.apache.org/">Maven 3.2+</a></li>
+<li><a class="reference external" href="https://tomcat.apache.org/download-70.cgi">Tomcat 7+</a></li>
+<li><a class="reference external" href="http://cassandra.apache.org/download/">Cassandra 1.2.1*</a></li>
+<li><a class="reference external" href="https://www.elastic.co/downloads/elasticsearch">ElasticSearch
+1.4+</a></li>
+<li><a class="reference external" href="https://github.com/apache/incubator-usergrid/tree/two-dot-o">Usergrid
+2.0</a></li>
+</ul>
+</div>
+<div class="section" id="running">
+<h2>Running<a class="headerlink" href="#running" title="Permalink to this headline">¶</a></h2>
+<ol class="arabic simple">
+<li>Start up Cassandra  <a class="footnote-reference" href="#id2" id="id1">[1]</a><ol class="loweralpha">
+<li>To do this you can navigate to the cassandra folder and run
+<code class="docutils literal"><span class="pre">./bin/cassandra</span></code></li>
+</ol>
+</li>
+<li>Start up Elasticsearch<ol class="loweralpha">
+<li>To do this you can navigate to the folder where you extracted
+elasticsearch and run <code class="docutils literal"><span class="pre">/bin/elasticsearch</span></code></li>
+</ol>
+</li>
+</ol>
+<div class="section" id="running-usergrid">
+<h3>Running Usergrid<a class="headerlink" href="#running-usergrid" title="Permalink to this headline">¶</a></h3>
+<div class="section" id="build-the-java-sdk">
+<h4>Build The Java Sdk<a class="headerlink" href="#build-the-java-sdk" title="Permalink to this headline">¶</a></h4>
+<ol class="arabic simple">
+<li>Navigate to where you cloned the usergrid repo</li>
+<li>Navigate to the <code class="docutils literal"><span class="pre">sdks/java</span></code> directory</li>
+<li>Run <code class="docutils literal"><span class="pre">mvn</span> <span class="pre">clean</span> <span class="pre">install</span></code></li>
+</ol>
+</div>
+<div class="section" id="build-the-stack-itself">
+<h4>Build The Stack Itself<a class="headerlink" href="#build-the-stack-itself" title="Permalink to this headline">¶</a></h4>
+<ol class="arabic simple">
+<li>Navigate to the <code class="docutils literal"><span class="pre">stack</span></code> directory.</li>
+<li>Run <code class="docutils literal"><span class="pre">mvn</span> <span class="pre">clean</span> <span class="pre">install</span> <span class="pre">-DskipTests</span></code></li>
+<li>This will generate a war at <code class="docutils literal"><span class="pre">rest/target/ROOT.war</span></code></li>
+</ol>
+</div>
+<div class="section" id="deploying-the-stack-locally">
+<h4>Deploying the Stack Locally<a class="headerlink" href="#deploying-the-stack-locally" title="Permalink to this headline">¶</a></h4>
+<ol class="arabic simple">
+<li>Take this war and deploy it on downloaded tomcat.</li>
+<li>In the lib directory of the tomcat you must also put
+usergrid-deployment.properties. ( An example file is provided below)</li>
+<li>Start up Tomcat<ol class="loweralpha">
+<li>To do this you can navigate to folder where Tomcat is install and
+run <code class="docutils literal"><span class="pre">./bin/catalina.sh</span> <span class="pre">start</span></code></li>
+</ol>
+</li>
+<li>Go to a web browser and input the following to initilizing the
+database <code class="docutils literal"><span class="pre">localhost:8080/system/database/setup</span></code>.<ol class="loweralpha">
+<li>The credentials it asks for are the admin credentialls and
+password as defined in the usergrid-deployment.properties.</li>
+<li>You can also do a curl call with basic auth to automatically
+authenticate the call instead of using the web browser.</li>
+</ol>
+</li>
+<li>Then using the same steps as before call
+<code class="docutils literal"><span class="pre">localhost:8080/system/superuser/setup</span></code></li>
+</ol>
+<p>The stack is now ready to be queried against, but to get the most out of
+it you&#8217;ll need to initilize and use our portal!</p>
+</div>
+<div class="section" id="running-the-portal-locally">
+<h4>Running The Portal Locally<a class="headerlink" href="#running-the-portal-locally" title="Permalink to this headline">¶</a></h4>
+<div class="section" id="requirments">
+<h5>Requirments<a class="headerlink" href="#requirments" title="Permalink to this headline">¶</a></h5>
+<p><a class="reference external" href="https://nodejs.org/download/">nodejs 0.10+</a></p>
+<ol class="arabic simple">
+<li>Make sure you&#8217;ve installed node.js above. Any version above .10 or
+.10 should work fine.</li>
+<li>Navigate to <code class="docutils literal"><span class="pre">incubator-usergrid/portal</span></code>.</li>
+<li>Open config.js and make sure the override URL is pointing to your
+local tomcat.</li>
+<li>Now in the portal folder run the following command <code class="docutils literal"><span class="pre">./build.sh</span> <span class="pre">dev</span></code></li>
+<li>The portal should automatically open ready for use!</li>
+</ol>
+<p>Now usergrid is fully ready to use! Feel free to query against it or use
+it however you like!</p>
+</div>
+</div>
+</div>
+</div>
+<div class="section" id="example-usergrid-deployment-properties-file">
+<h2>Example <strong>usergrid-deployment.properties</strong> file<a class="headerlink" href="#example-usergrid-deployment-properties-file" title="Permalink to this headline">¶</a></h2>
+<div class="highlight-python"><div class="highlight"><pre># core persistence properties
+
+cassandra.embedded=false
+cassandra.version=1.2.18
+cassandra.timeout=2000
+
+collections.keyspace=Usergrid_Applications
+collections.keyspace.strategy.options=replication_factor:1
+collections.keyspace.strategy.class=org.apache.cassandra.locator.SimpleStrategy
+
+collection.stage.transient.timeout=60
+
+hystrix.threadpool.graph_user.coreSize=40
+hystrix.threadpool.graph_async.coreSize=40
+
+elasticsearch.embedded=false
+elasticsearch.cluster_name=elasticsearch
+elasticsearch.index_prefix=usergrid
+elasticsearch.hosts=127.0.0.1
+elasticsearch.port=9300
+
+elasticsearch.force_refresh=true
+
+index.query.limit.default=100
+
+# Max Cassandra connections, applies to both CP and EM
+cassandra.connections=600
+
+######################################################
+# Minimal Usergrid configuration properties for local Tomcat and Cassandra
+#
+
+cassandra.url=127.0.0.1:9160
+
+cassandra.keyspace.strategy=org.apache.cassandra.locator.SimpleStrategy
+cassandra.keyspace.strategy.options.replication_factor=1
+
+######################################################
+# Custom mail transport
+
+mail.transport.protocol=smtps
+mail.smtps.host=smtp.gmail.com
+mail.smtps.port=465
+mail.smtps.auth=true
+mail.smtps.username=
+mail.smtps.password=
+mail.smtps.quitwait=false
+
+
+######################################################
+# Admin and test user setup
+
+usergrid.sysadmin.login.name=superuser
+usergrid.sysadmin.login.email=myself@example.com     &lt;--- Change this
+usergrid.sysadmin.login.password=pwHERE               &lt;--- Change this
+usergrid.sysadmin.login.allowed=true
+usergrid.sysadmin.email=myself@example.com           &lt;--- Change this
+
+usergrid.sysadmin.approve.users=false
+usergrid.sysadmin.approve.organizations=false
+
+# Base mailer account - default for all outgoing messages
+usergrid.management.mailer=User &lt;myself@example.com&gt;    &lt;--- Change this
+
+usergrid.setup-test-account=true
+
+usergrid.test-account.app=test-app
+usergrid.test-account.organization=test-organization
+usergrid.test-account.admin-user.username=test
+usergrid.test-account.admin-user.name=Test User
+usergrid.test-account.admin-user.email=myself@example.com    &lt;---Change this
+usergrid.test-account.admin-user.password=test
+
+######################################################
+# Auto-confirm and sign-up notifications settings
+
+usergrid.management.admin_users_require_confirmation=false
+usergrid.management.admin_users_require_activation=false
+
+usergrid.management.organizations_require_activation=false
+usergrid.management.notify_sysadmin_of_new_organizations=true
+usergrid.management.notify_sysadmin_of_new_admin_users=true
+######################################################
+# URLs
+
+# Redirect path when request come in for TLD
+usergrid.redirect_root=http://localhost:8080/status
+
+usergrid.view.management.organizations.organization.activate=http://localhost:8080/accounts/welcome
+usergrid.view.management.organizations.organization.confirm=http://localhost:8080/accounts/welcome
+usergrid.view.management.users.user.activate=http://localhost:8080/accounts/welcome
+usergrid.view.management.users.user.confirm=http://localhost:8080/accounts/welcome
+
+usergrid.organization.activation.url=http://localhost:8080/management/organizations/%s/activate
+usergrid.admin.activation.url=http://localhost:8080/management/users/%s/activate
+usergrid.admin.resetpw.url=http://localhost:8080/management/users/%s/resetpw
+usergrid.admin.confirmation.url=http://localhost:8080/management/users/%s/confirm
+usergrid.user.activation.url=http://localhost:8080%s/%s/users/%s/activate
+usergrid.user.confirmation.url=http://localhost:8080/%s/%s/users/%s/confirm
+usergrid.user.resetpw.url=http://localhost:8080/%s/%s/users/%s/resetpw
+</pre></div>
+</div>
+<table class="docutils footnote" frame="void" id="id2" rules="none">
+<colgroup><col class="label" /><col /></colgroup>
+<tbody valign="top">
+<tr><td class="label"><a class="fn-backref" href="#id1">[1]</a></td><td>You can start up cassandra and elasticsearch in any order but for the
+sake of ordered lists I put Cassandra first.</td></tr>
+</tbody>
+</table>
+</div>
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+      
+        <a href="../reference/presos-and-videos.html" class="btn btn-neutral float-right" title="Presentations &amp; Videos" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+      
+      
+        <a href="ug1-launcher-quick-start.html" class="btn btn-neutral" title="Usegrid 1: Launcher Quick-start" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+      
+    </div>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/introduction/async-vs-sync.html
----------------------------------------------------------------------
diff --git a/content/docs/introduction/async-vs-sync.html b/content/docs/introduction/async-vs-sync.html
new file mode 100644
index 0000000..caf0163
--- /dev/null
+++ b/content/docs/introduction/async-vs-sync.html
@@ -0,0 +1,341 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>Async vs. sync calls &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+        <link rel="next" title="Creating a new application" href="../getting-started/creating-a-new-application.html"/>
+        <link rel="prev" title="Usergrid Data model" href="data-model.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">Async vs. sync calls</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#synchronous">Synchronous</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#asynchronous">Asynchronous</a></li>
+</ul>
+</li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>Async vs. sync calls</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/introduction/async-vs-sync.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="async-vs-sync-calls">
+<h1>Async vs. sync calls<a class="headerlink" href="#async-vs-sync-calls" title="Permalink to this headline">¶</a></h1>
+<p>The Usergrid SDKs work by making RESTful API calls from your application
+to the API. In some cases, both synchronous and asynchronous calls are
+supported for most methods, as in the case of the Usergrid Android SDK,
+while in others only asynchronous calls are supported, as in the
+Usergrid JavaScript SDK. The following is a brief explanation of
+synchronous vs. asynchronous API calls.</p>
+<div class="section" id="synchronous">
+<h2>Synchronous<a class="headerlink" href="#synchronous" title="Permalink to this headline">¶</a></h2>
+<p>If an API call is synchronous, it means that code execution will block
+(or wait) for the API call to return before continuing. This means that
+until a response is returned by the API, your application will not
+execute any further, which could be perceived by the user as latency or
+performance lag in your app. Making an API call synchronously can be
+beneficial, however, if there if code in your app that will only execute
+properly once the API response is received.</p>
+</div>
+<div class="section" id="asynchronous">
+<h2>Asynchronous<a class="headerlink" href="#asynchronous" title="Permalink to this headline">¶</a></h2>
+<p>Asynchronous calls do not block (or wait) for the API call to return
+from the server. Execution continues on in your program, and when the
+call returns from the server, a &#8220;callback&#8221; function is executed. For
+example, in the following code using the Usergrid JavScript SDK, the
+function called dogCreateCallback will be called when the create dog API
+call returns from the server. Meanwhile, execution will continue:</p>
+<div class="highlight-python"><div class="highlight"><pre>function dogCreateCallback(err, dog) {
+    alert(&#39;I will probably be called second&#39;);
+    if (err) {
+        //Error - Dog not created
+    } else {
+        //Success - Dog was created
+
+    }
+}
+
+client.createEntity({type:&#39;dogs&#39;}, dogCreateCallback);
+alert(&#39;I will probably be called first&#39;);
+</pre></div>
+</div>
+<p>The result of this is that we cannot guarantee the order of the two
+alert statements. Most likely, the alert right after the createEntity
+function call will be called first since the API call will take a second
+or so to complete.</p>
+<p>The important point is that program execution will continue, and
+asynchronously, the callback function will be called once program
+execution completes.</p>
+</div>
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+      
+        <a href="../getting-started/creating-a-new-application.html" class="btn btn-neutral float-right" title="Creating a new application" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+      
+      
+        <a href="data-model.html" class="btn btn-neutral" title="Usergrid Data model" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+      
+    </div>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/introduction/data-model.html
----------------------------------------------------------------------
diff --git a/content/docs/introduction/data-model.html b/content/docs/introduction/data-model.html
new file mode 100644
index 0000000..e8aba1e
--- /dev/null
+++ b/content/docs/introduction/data-model.html
@@ -0,0 +1,449 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>Usergrid Data model &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+        <link rel="next" title="Async vs. sync calls" href="async-vs-sync.html"/>
+        <link rel="prev" title="Usergrid Features" href="usergrid-features.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">Usergrid Data model</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#organizations">Organizations</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#applications">Applications</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#collections">Collections</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#entities">Entities</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#default-entities">Default entities</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#properties">Properties</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#default-properties">Default properties</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>Usergrid Data model</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/introduction/data-model.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="usergrid-data-model">
+<h1>Usergrid Data model<a class="headerlink" href="#usergrid-data-model" title="Permalink to this headline">¶</a></h1>
+<p>Usergrid models the data for your apps as application-specific
+collections of data entities managed within an organization. The
+following is an overview of the component hierarchy that makes up the
+data model, and is intended to help you understand how data is stored,
+managed and accessed.</p>
+<div class="section" id="organizations">
+<h2>Organizations<a class="headerlink" href="#organizations" title="Permalink to this headline">¶</a></h2>
+<p>An organization contains one or more applications, and represents
+administrator-level access. Multiple accounts may be given administrator
+access to an organization. Accounts can also be members of multiple
+organizations.</p>
+<p>An organization with the same name as your username is automatically
+created for you when you sign up. By default, you are assigned as the
+administrator of this organization.</p>
+</div>
+<div class="section" id="applications">
+<h2>Applications<a class="headerlink" href="#applications" title="Permalink to this headline">¶</a></h2>
+<p>In Usergrid, you can create one or more applications within an
+organization. Applications represent an instance of application data
+associated with an app, and you may create as many applications as you
+wish. This allows you to utilize the backend in a way that corresponds
+to your development process. For example, you might create separate
+applications for development and production instances of your app. By
+default, all organization have a sandbox application (see Using a
+Sandbox Application for important information regarding the default
+sandbox application).</p>
+<p>Each application provides the infrastructure for storing, retrieving,
+updating and deleting the entities and collections associated with a
+specific app instance.</p>
+</div>
+<div class="section" id="collections">
+<h2>Collections<a class="headerlink" href="#collections" title="Permalink to this headline">¶</a></h2>
+<p>Usergrid stores all data entities in uniquely-named collections.
+Collections are created automatically for every entity type, including
+custom entities, and are named using the plural form of the entity type
+they store. For example, all user entities are stored in the /users
+collection, and all device entities in the /devices collection. An
+entity can belong to only one collection.</p>
+<p>Currently, collections cannot be renamed or deleted; however, all of the
+data entities in a collection can be updated or deleted.</p>
+</div>
+<div class="section" id="entities">
+<h2>Entities<a class="headerlink" href="#entities" title="Permalink to this headline">¶</a></h2>
+<p>An entity represents a basic, JSON-formatted data object that is used by
+your app, such as a user, device, event or asset. Unlike records in
+conventional database tables, which have a rigid schema that defines
+what they can store and how they can be related to each other, Usergrid
+entities are very flexible. This makes Usergrid a powerful solution for
+managing data for modern applications, where people, places, and content
+often need to be associated in a way that is most appropriate from a
+user perspective.</p>
+<p>Here is a simple example of an entity:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+  <span class="s">&quot;uuid&quot;</span> <span class="p">:</span> <span class="s">&quot;5c0c1789-d503-11e1-b36a-12313b01d5c1&quot;</span><span class="p">,</span>
+  <span class="s">&quot;type&quot;</span> <span class="p">:</span> <span class="s">&quot;user&quot;</span><span class="p">,</span>
+  <span class="s">&quot;created&quot;</span> <span class="p">:</span> <span class="mi">1343074620374</span><span class="p">,</span>
+  <span class="s">&quot;modified&quot;</span> <span class="p">:</span> <span class="mi">1355442681264</span><span class="p">,</span>
+  <span class="s">&quot;username&quot;</span> <span class="p">:</span> <span class="s">&quot;john.doe&quot;</span><span class="p">,</span>
+  <span class="s">&quot;email&quot;</span> <span class="p">:</span> <span class="s">&quot;jdoe57@mail.com&quot;</span><span class="p">,</span>
+  <span class="s">&quot;name&quot;</span> <span class="p">:</span> <span class="s">&quot;John Doe&quot;</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="default-entities">
+<h2>Default entities<a class="headerlink" href="#default-entities" title="Permalink to this headline">¶</a></h2>
+<p>The following entity types are predefined in Usergrid. For more details,
+see Default Data Entity Types.</p>
+<ul class="simple">
+<li>user</li>
+<li>group</li>
+<li>role</li>
+<li>application</li>
+<li>activity</li>
+<li>device</li>
+<li>asset</li>
+<li>folder</li>
+<li>event</li>
+<li>notifier</li>
+<li>notification</li>
+<li>receipt</li>
+</ul>
+</div>
+<div class="section" id="properties">
+<h2>Properties<a class="headerlink" href="#properties" title="Permalink to this headline">¶</a></h2>
+<p>A data entity is a set of properties, which can each contain any
+JSON-representable value, including a nested JSON document. All entities
+have predefined properties, but you are free to define any number of
+custom properties for any entity. Default properties require specific
+data types for validation purposes, while custom properties can be any
+JSON data type. Most predefined and all application-defined entity
+properties are indexed, allowing you to query collections quickly and
+easily.</p>
+<p>Individual or multiple properties can be updated in a single operation;
+however, partial updating of nested JSON documents is not supported.
+This means that all properties of a nested document must be provided in
+a PUT request for the update of the nested document to be processed,
+even if the some of the values have not changed.</p>
+</div>
+<div class="section" id="default-properties">
+<h2>Default properties<a class="headerlink" href="#default-properties" title="Permalink to this headline">¶</a></h2>
+<p>At a minimum, each entity is defined by two properties, both of which
+are strings: type and UUID. The entity &#8216;type&#8217; is the singular form of
+the collection the entity is stored in. For example, an entity in the
+&#8216;users&#8217; collection has an entity type of &#8216;user&#8217;. The entity &#8216;UUID&#8217; is an
+immutable universally unique identifier, which can be used to reference
+the entity. A UUID is automatically generated for every entity when it
+is created. You can also create custom entities and entity properties;
+however, Usergrid reserves certain entity types with pre-defined
+properties by default. For a complete list of reserved entities and
+properties, see Default Data Entity Types.</p>
+<p>When you access the system via the API, you’ll always provide your
+organization UUID or name, application UUID or name, and typically the
+UUID or name of the entity you’re modifying or retrieving.</p>
+<p>All entities have the following default properties:</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="16%" />
+<col width="12%" />
+<col width="73%" />
+</colgroup>
+<tbody valign="top">
+<tr class="row-odd"><td>Property</td>
+<td>Type</td>
+<td>Description</td>
+</tr>
+<tr class="row-even"><td>uuid</td>
+<td>UUID</td>
+<td>Entity unique id</td>
+</tr>
+<tr class="row-odd"><td>type</td>
+<td>string</td>
+<td>entity type (for example, user)</td>
+</tr>
+<tr class="row-even"><td>created</td>
+<td>long</td>
+<td>UTC timestamp in milliseconds of when the entity was
+created</td>
+</tr>
+<tr class="row-odd"><td>modified</td>
+<td>long</td>
+<td>UTC timestamp in milliseconds of when the entity was
+last modified</td>
+</tr>
+</tbody>
+</table>
+<p>Custom entities also have an optional name property that is a string
+identifier.</p>
+</div>
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+      
+        <a href="async-vs-sync.html" class="btn btn-neutral float-right" title="Async vs. sync calls" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+      
+      
+        <a href="usergrid-features.html" class="btn btn-neutral" title="Usergrid Features" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+      
+    </div>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

[06/60] [abbrv] incubator-usergrid git commit: cherry picking docs from master

[sn...@apache.org]

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/user-management/activity.html
----------------------------------------------------------------------
diff --git a/content/docs/user-management/activity.html b/content/docs/user-management/activity.html
new file mode 100644
index 0000000..12e632b
--- /dev/null
+++ b/content/docs/user-management/activity.html
@@ -0,0 +1,867 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>Activity &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+        <link rel="next" title="Social Graph Connections" href="user-connections.html"/>
+        <link rel="prev" title="Working with group data" href="group.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="group.html">Working with group data</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">Activity</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#posting-activities">Posting activities</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#request-uri">Request URI</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#example-request">Example - Request</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#example-response">Example - Response</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#posting-an-activity-to-a-group">Posting an activity to a group</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#id1">Request URI</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id2">Example - Request</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id3">Example - Response</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#creating-an-activity-for-a-user-s-followers-in-a-group">Creating an activity for a user&#8217;s followers in a group</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#id4">Request URI</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id5">Example - Request</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id6">Example - Response</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#retrieving-activity-feeds">Retrieving activity feeds</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#id7">Request URI</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id8">Example - Request</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id9">Example - Response</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#retrieving-a-group-s-activity-feed">Retrieving a group&#8217;s activity feed</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#id10">Request URI</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id11">Example - Request</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id12">Example - Response</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>Activity</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/user-management/activity.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="activity">
+<h1>Activity<a class="headerlink" href="#activity" title="Permalink to this headline">¶</a></h1>
+<p>Most modern applications struggle to manage data streams, such as those
+that contain an ongoing list of comments, activities, and tweets. In
+particular, mobile applications are prone to generating very large
+amounts of data in a data stream. Beyond that, additions to a data
+stream must often be routed automatically to subscribers or filtered or
+counted.</p>
+<p>Usergrid provides an activity entity that is specifically designed for
+data streams. An activity is an entity type that represents activity
+stream actions (see the <a class="reference external" href="http://activitystrea.ms/specs/json/1.0/">JSON Activity Streams 1.0
+specification</a> for more
+information about these actions).</p>
+<p>When a user creates an activity, it creates a relationship between the
+activity and the user who created it. Because this relationship exists,
+the activity will appear in the feed of any of the user’s followers.
+Think of the Activities endpoint (/users/{uuid|username}/activities) as
+an &#8220;outbox&#8221; of news items created by the user. Think of the Feed
+endpoint (/users/{uuid|username}/feed) as an &#8220;inbox&#8221; of news items
+meant to be seen or consumed by the user.</p>
+<p>A user can also post an activity to a group (located at
+/groups/{uuid|groupname}/activities). This allows you to emulate
+Facebook-style group functionality, where a limited number of users can
+share content on a common &#8220;wall&#8221;. In any of these cases, there is no
+need to construct publish/subscribe relationships manually.</p>
+<p>Activity entities are particularly useful in applications that enable
+users to post content to activity streams (also called feeds) and to
+display activity streams. Some examples of these applications are
+Twitter, foursquare, and Pinterest.&nbsp;For example, when a Twitter user
+posts a short, 140-character or less, &#8220;tweet&#8221;, that activity gets added
+to the user&#8217;s activity stream for display as well as to the activity
+streams of any of the user&#8217;s followers.</p>
+<p>Using Usergrid APIs you can create, retrieve, update, and delete
+activity entities. See You do not have access to view this node for
+descriptions of these APIs.</p>
+<p><strong>Note:</strong>&nbsp;Although not shown in the API examples below, you need to
+provide a valid access token with each API call. See <a class="reference external" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating
+users and application
+clients</a>
+for details.</p>
+<div class="section" id="posting-activities">
+<h2>Posting activities<a class="headerlink" href="#posting-activities" title="Permalink to this headline">¶</a></h2>
+<p>Posting a user activity</p>
+<p>Use the POST method to create an activity in the activities collection.</p>
+<div class="section" id="request-uri">
+<h3>Request URI<a class="headerlink" href="#request-uri" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>POST /&lt;org_id&gt;/&lt;app_id&gt;/users/&lt;uuid | username&gt;/activities { request body }
+</pre></div>
+</div>
+<p>Parameters</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="39%" />
+<col width="61%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>arg uuid|string org_id</td>
+<td>Organization UUID or organization name</td>
+</tr>
+<tr class="row-odd"><td>arg uuid|string app_id</td>
+<td>Application UUID or application name</td>
+</tr>
+<tr class="row-even"><td>request body</td>
+<td>One or more sets of activity properties</td>
+</tr>
+</tbody>
+</table>
+<p>Here&#8217;s an example request body:</p>
+<div class="highlight-python"><div class="highlight"><pre>{
+    &quot;actor&quot;:{
+        &quot;displayName&quot;:&quot;John Doe&quot;,
+        &quot;uuid&quot;:&quot;1f3567aa-da83-11e1-afad-12313b01d5c1&quot;,
+        &quot;username&quot;:&quot;john.doe&quot;,
+        &quot;image&quot;:{
+            &quot;duration&quot;:0,
+            &quot;height&quot;:80,
+            &quot;url&quot;:&quot;http://www.gravatar.com/avatar/&quot;,&quot;width&quot;:80},
+            &quot;email&quot;:&quot;john.doe@gmail.com&quot;
+        },
+        &quot;verb&quot;:&quot;post&quot;,
+        &quot;content&quot;:&quot;Hello World!&quot;
+    }
+}
+</pre></div>
+</div>
+</div>
+<div class="section" id="example-request">
+<h3>Example - Request<a class="headerlink" href="#example-request" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X POST &quot;https://api.usergrid.com/my-org/my-app/users/john.doe/activities&quot; -d &#39;{&quot;actor&quot;:{&quot;displayName&quot;:&quot;John Doe&quot;,&quot;uuid&quot;:&quot;1f3567aa-da83-11e1-afad-12313b01d5c1&quot;,&quot;username&quot;:&quot;john.doe&quot;, &quot;image&quot;:{&quot;duration&quot;:0,&quot;height&quot;:80,&quot;url&quot;:&quot;http://www.gravatar.com/avatar/&quot;,&quot;width&quot;:80}, &quot;email&quot;:&quot;john.doe@gmail.com&quot;},&quot;verb&quot;:&quot;post&quot;,&quot;content&quot;:&quot;Hello World!&quot;}&#39;
+</pre></div>
+</div>
+</div>
+<div class="section" id="example-response">
+<h3>Example - Response<a class="headerlink" href="#example-response" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+    <span class="s">&quot;action&quot;</span> <span class="p">:</span> <span class="s">&quot;post&quot;</span><span class="p">,</span>
+    <span class="s">&quot;application&quot;</span> <span class="p">:</span> <span class="s">&quot;5111c463-6a42-11e1-b6dd-1231380a0284&quot;</span><span class="p">,</span>
+     <span class="s">&quot;params&quot;</span> <span class="p">:</span> <span class="p">{</span>
+    <span class="p">},</span>
+    <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/1f3567aa-da83-11e1-afad-12313b01d5c1/activities&quot;</span><span class="p">,</span>
+    <span class="s">&quot;uri&quot;</span> <span class="p">:</span> <span class="s">&quot;https://api.usergrid.com/5111c463-6a42-11e1-b6dd-1231380a0284/users/1f3567aa-da83-11e1-afad-12313b01d5c1/activities&quot;</span><span class="p">,</span>
+    <span class="s">&quot;entities&quot;</span> <span class="p">:</span> <span class="p">[</span> <span class="p">{</span>
+        <span class="s">&quot;uuid&quot;</span> <span class="p">:</span> <span class="s">&quot;da448955-f3aa-11e1-8042-12313d331ae8&quot;</span><span class="p">,</span>
+        <span class="s">&quot;type&quot;</span> <span class="p">:</span> <span class="s">&quot;activity&quot;</span><span class="p">,</span>
+        <span class="s">&quot;created&quot;</span> <span class="p">:</span> <span class="mi">1346445092974</span><span class="p">,</span>
+        <span class="s">&quot;modified&quot;</span> <span class="p">:</span> <span class="mi">1346445092974</span><span class="p">,</span>
+        <span class="s">&quot;actor&quot;</span> <span class="p">:</span> <span class="p">{</span>
+            <span class="s">&quot;displayName&quot;</span> <span class="p">:</span> <span class="s">&quot;John Doe&quot;</span><span class="p">,</span>
+            <span class="s">&quot;uuid&quot;</span> <span class="p">:</span> <span class="s">&quot;1f3567aa-da83-11e1-afad-12313b01d5c1&quot;</span><span class="p">,</span>
+            <span class="s">&quot;username&quot;</span> <span class="p">:</span> <span class="s">&quot;john.doe&quot;</span><span class="p">,</span>
+            <span class="s">&quot;image&quot;</span> <span class="p">:</span> <span class="p">{</span>
+                <span class="s">&quot;duration&quot;</span> <span class="p">:</span> <span class="mi">0</span><span class="p">,</span>
+                <span class="s">&quot;height&quot;</span> <span class="p">:</span> <span class="mi">80</span><span class="p">,</span>
+                <span class="s">&quot;url&quot;</span> <span class="p">:</span> <span class="s">&quot;http://www.gravatar.com/avatar/&quot;</span><span class="p">,</span>
+                <span class="s">&quot;width&quot;</span> <span class="p">:</span> <span class="mi">80</span>
+            <span class="p">},</span>
+            <span class="s">&quot;email&quot;</span> <span class="p">:</span> <span class="s">&quot;john.doe@gmail.com&quot;</span>
+        <span class="p">},</span>
+        <span class="s">&quot;content&quot;</span> <span class="p">:</span> <span class="s">&quot;Hello World!&quot;</span><span class="p">,</span>
+        <span class="s">&quot;metadata&quot;</span> <span class="p">:</span> <span class="p">{</span>
+            <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/1f3567aa-da83-11e1-afad-12313b01d5c1/activities/da448955-f3aa-11e1-8042-12313d331ae8&quot;</span>
+        <span class="p">},</span>
+        <span class="s">&quot;published&quot;</span> <span class="p">:</span> <span class="mi">1346445092974</span><span class="p">,</span>
+        <span class="s">&quot;verb&quot;</span> <span class="p">:</span> <span class="s">&quot;post&quot;</span>
+    <span class="p">}</span> <span class="p">],</span>
+    <span class="s">&quot;timestamp&quot;</span> <span class="p">:</span> <span class="mi">1346445092827</span><span class="p">,</span>
+    <span class="s">&quot;duration&quot;</span> <span class="p">:</span> <span class="mi">1406</span><span class="p">,</span>
+    <span class="s">&quot;organization&quot;</span><span class="p">:</span> <span class="s">&quot;my-org&quot;</span><span class="p">,</span>
+    <span class="s">&quot;applicationName&quot;</span><span class="p">:</span> <span class="s">&quot;my-app&quot;</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+<p><strong>Note</strong>: Anytime a logged-in user makes a request, you can substitute
+&#8220;me&#8221; for the uuid or username. So the format of a request to create an
+activity for the currently logged-in user would look like this:</p>
+<div class="highlight-python"><div class="highlight"><pre>POST /&lt;org_id&gt;/&lt;app_id&gt;/users/me/activities { request body }
+</pre></div>
+</div>
+<p>The <code class="docutils literal"><span class="pre">/users/me</span></code> endpoint is accessible only if you provide an access
+token with the request. If you don&#8217;t provide an access token with the
+request, that is, you make an anonymous (or &#8220;guest&#8221;) call, the system
+will not be able to determine which user to return as <code class="docutils literal"><span class="pre">/users/me</span></code>.</p>
+<p>When you create an activity it creates a relationship between the
+activity and the user who created it. In other words, the newly created
+activity above belongs to john.doe. Another way of saying this is the
+user &#8220;owns&#8221; the activity. And because this relationship exists, the
+activity will appear in the feed of any of the user’s followers (in this
+example, anyone who is following john.doe). However, it will not appear
+in the feed of people the user follows. The activity is accessible at
+the <code class="docutils literal"><span class="pre">/activities</span></code> endpoint to users who have the permission to read
+that endpoint.</p>
+<p>Notice the properties specified in the request body in the previous
+example are actor, verb, and content. The actor, verb, and content
+properties are built into the Activity entity (see Default Data Entity
+Types). The actor property specifies properties of the entity that
+performs the action (here, user john.doe). The gravatar URL is used to
+create an icon for the activity. And because an Activity is simply an
+API Services data entity, you can also create custom properties.</p>
+<p>The verb parameter is descriptive. You can use it to indicate what type
+of activity is posted, for example, an image versus text. The value post
+is defined in the JSON Activity Streams specification as “the act of
+authoring an object and then publishing it online.“</p>
+</div>
+</div>
+<div class="section" id="posting-an-activity-to-a-group">
+<h2>Posting an activity to a group<a class="headerlink" href="#posting-an-activity-to-a-group" title="Permalink to this headline">¶</a></h2>
+<p>Use the POST method to post an activity to a specific group. In this
+case the activity is created in the activities collection and is
+accessible at the /activities endpoint to users who have the permission
+to read that endpoint. In addition, a relationship is established
+between the activity and the group, and because of that, the activity
+will appear in the group’s feed. The group &#8220;owns&#8221; the activity. Also,
+the activity will be published in the feed of all users that are members
+of the group.</p>
+<div class="section" id="id1">
+<h3>Request URI<a class="headerlink" href="#id1" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>POST /{org_id}/{app_id}/groups/{uuid|groupname}/activities {request body}
+</pre></div>
+</div>
+<p>Parameters</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="41%" />
+<col width="59%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>arg uuid|string org_id</td>
+<td>Organization UUID or organization name</td>
+</tr>
+<tr class="row-odd"><td>arg uuid|string app_id</td>
+<td>Application UUID or application name</td>
+</tr>
+<tr class="row-even"><td>arg uuid|string groupname</td>
+<td>UUID or name of the group</td>
+</tr>
+<tr class="row-odd"><td>request body</td>
+<td>One or more sets of activity properties.</td>
+</tr>
+</tbody>
+</table>
+<p>Here&#8217;s a sample request body:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+  <span class="s">&quot;actor&quot;</span><span class="p">:</span>
+    <span class="p">{</span>
+    <span class="s">&quot;displayName&quot;</span><span class="p">:</span><span class="s">&quot;John Doe&quot;</span><span class="p">,</span>
+    <span class="s">&quot;uuid&quot;</span><span class="p">:</span><span class="s">&quot;1f3567aa-da83-11e1-afad-12313b01d5c1&quot;</span><span class="p">,</span>
+    <span class="s">&quot;username&quot;</span><span class="p">:</span><span class="s">&quot;john.doe&quot;</span><span class="p">,</span>
+    <span class="s">&quot;image&quot;</span><span class="p">:{</span>
+      <span class="s">&quot;duration&quot;</span><span class="p">:</span><span class="mi">0</span><span class="p">,</span>
+      <span class="s">&quot;height&quot;</span><span class="p">:</span><span class="mi">80</span><span class="p">,</span>
+      <span class="s">&quot;url&quot;</span><span class="p">:</span><span class="s">&quot;http://www.gravatar.com/avatar/&quot;</span><span class="p">,</span><span class="s">&quot;width&quot;</span><span class="p">:</span><span class="mi">80</span><span class="p">},</span>
+  <span class="s">&quot;email&quot;</span><span class="p">:</span><span class="s">&quot;john.doe@gmail.com&quot;</span><span class="p">},</span>
+  <span class="s">&quot;verb&quot;</span><span class="p">:</span><span class="s">&quot;post&quot;</span><span class="p">,</span>
+  <span class="s">&quot;content&quot;</span><span class="p">:</span><span class="s">&quot;Hello World!&quot;</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="id2">
+<h3>Example - Request<a class="headerlink" href="#id2" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X POST &quot;https://api.usergrid.com/my-org/my-app/groups/mygroup/activities&quot; -d &#39;{&quot;actor&quot;:{&quot;displayName&quot;:&quot;John Doe&quot;,&quot;uuid&quot;:&quot;1f3567aa-da83-11e1-afad-12313b01d5c1&quot;,&quot;username&quot;:&quot;john.doe&quot;, &quot;image&quot;:{&quot;duration&quot;:0,&quot;height&quot;:80,&quot;url&quot;:&quot;http://www.gravatar.com/avatar/&quot;,&quot;width&quot;:80}, &quot;email&quot;:&quot;john.doe@gmail.com&quot;},&quot;verb&quot;:&quot;post&quot;,&quot;content&quot;:&quot;Hello World!&quot;}&#39;
+</pre></div>
+</div>
+<p>Because this relationship exists, this activity will appear in the feed
+of all users who are members of mygroup. It won&#8217;t appear in the feeds of
+the group members’ followers or in feeds of users they follow.</p>
+</div>
+<div class="section" id="id3">
+<h3>Example - Response<a class="headerlink" href="#id3" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+  <span class="s">&quot;action&quot;</span><span class="p">:</span> <span class="s">&quot;post&quot;</span><span class="p">,</span>
+  <span class="s">&quot;application&quot;</span><span class="p">:</span> <span class="s">&quot;3400ba10-cd0c-11e1-bcf7-12313d1c4491&quot;</span><span class="p">,</span>
+  <span class="s">&quot;params&quot;</span><span class="p">:</span>  <span class="p">{},</span>
+  <span class="s">&quot;path&quot;</span><span class="p">:</span> <span class="s">&quot;/groups/d87edec7-fc4d-11e1-9917-12313d1520f1/activities&quot;</span><span class="p">,</span>
+  <span class="s">&quot;uri&quot;</span><span class="p">:</span> <span class="s">&quot;https://api.usergrid.com/my-org/my-app/groups/d87edec7-fc4d-11e1-9917-12313d1520f1/activities&quot;</span><span class="p">,</span>
+  <span class="s">&quot;entities&quot;</span><span class="p">:</span>  <span class="p">[</span>
+     <span class="p">{</span>
+      <span class="s">&quot;uuid&quot;</span><span class="p">:</span> <span class="s">&quot;563f5d96-37f3-11e2-a0f7-02e81ae640dc&quot;</span><span class="p">,</span>
+      <span class="s">&quot;type&quot;</span><span class="p">:</span> <span class="s">&quot;activity&quot;</span><span class="p">,</span>
+      <span class="s">&quot;created&quot;</span><span class="p">:</span> <span class="mi">1353952903811</span><span class="p">,</span>
+      <span class="s">&quot;modified&quot;</span><span class="p">:</span> <span class="mi">1353952903811</span><span class="p">,</span>
+      <span class="s">&quot;actor&quot;</span><span class="p">:</span>  <span class="p">{</span>
+        <span class="s">&quot;displayName&quot;</span><span class="p">:</span> <span class="s">&quot;John Doe&quot;</span><span class="p">,</span>
+        <span class="s">&quot;uuid&quot;</span><span class="p">:</span> <span class="s">&quot;1f3567aa-da83-11e1-afad-12313b01d5c1&quot;</span><span class="p">,</span>
+        <span class="s">&quot;username&quot;</span><span class="p">:</span> <span class="s">&quot;john.doe&quot;</span><span class="p">,</span>
+        <span class="s">&quot;image&quot;</span><span class="p">:</span>  <span class="p">{</span>
+          <span class="s">&quot;duration&quot;</span><span class="p">:</span> <span class="mi">0</span><span class="p">,</span>
+          <span class="s">&quot;height&quot;</span><span class="p">:</span> <span class="mi">80</span><span class="p">,</span>
+          <span class="s">&quot;url&quot;</span><span class="p">:</span> <span class="s">&quot;http://www.gravatar.com/avatar/&quot;</span><span class="p">,</span>
+          <span class="s">&quot;width&quot;</span><span class="p">:</span> <span class="mi">80</span>
+        <span class="p">},</span>
+        <span class="s">&quot;email&quot;</span><span class="p">:</span> <span class="s">&quot;john.doe@gmail.com&quot;</span>
+      <span class="p">},</span>
+      <span class="s">&quot;content&quot;</span><span class="p">:</span> <span class="s">&quot;Hello World!&quot;</span><span class="p">,</span>
+      <span class="s">&quot;metadata&quot;</span><span class="p">:</span>  <span class="p">{</span>
+        <span class="s">&quot;path&quot;</span><span class="p">:</span> <span class="s">&quot;/groups/d87edec7-fc4d-11e1-9917-12313d1520f1/activities/563f5d96-37f3-11e2-a0f7-02e81ae640dc&quot;</span>
+      <span class="p">},</span>
+      <span class="s">&quot;published&quot;</span><span class="p">:</span> <span class="mi">1353952903811</span><span class="p">,</span>
+      <span class="s">&quot;verb&quot;</span><span class="p">:</span> <span class="s">&quot;post&quot;</span>
+    <span class="p">}</span>
+  <span class="p">],</span>
+  <span class="s">&quot;timestamp&quot;</span><span class="p">:</span> <span class="mi">1353952903800</span><span class="p">,</span>
+  <span class="s">&quot;duration&quot;</span><span class="p">:</span> <span class="mi">81</span><span class="p">,</span>
+  <span class="s">&quot;organization&quot;</span><span class="p">:</span> <span class="s">&quot;my-org&quot;</span><span class="p">,</span>
+  <span class="s">&quot;applicationName&quot;</span><span class="p">:</span> <span class="s">&quot;my-app&quot;</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+</div>
+<div class="section" id="creating-an-activity-for-a-user-s-followers-in-a-group">
+<h2>Creating an activity for a user&#8217;s followers in a group<a class="headerlink" href="#creating-an-activity-for-a-user-s-followers-in-a-group" title="Permalink to this headline">¶</a></h2>
+<p>Use the POST method to create an activity that will be published only in
+the feeds of users who (1) follow you, and (2) are in the same group to
+which you posted the activity. This is useful if you want to create
+specific groups of friends (for example, acquaintances or colleagues)
+and publish content to them with more precise privacy settings. This
+allows you to re-create a privacy model similar to Google+’s Circles or
+Facebook current privacy system.</p>
+<p>When you create an activity for a user’s followers in a group:</p>
+<p>The activity is accessible at the <code class="docutils literal"><span class="pre">/activities</span></code> endpoint to users who
+have the permission to read that endpoint. The activity will not be
+cross-posted to the group’s activity endpoint
+(<code class="docutils literal"><span class="pre">/groups/{uuid|groupname}/activities</span></code>) A relationship is
+automatically created between the activity entity that was just created
+and the user within that group
+(<code class="docutils literal"><span class="pre">/groups/{uuid|groupname}/users/{uuid|username}</span></code>) The user within the
+group (``/groups/{uuid|groupname}/users/{uuid|username}```)
+becomes the owner of the activity (through the owner property in the
+activity).</p>
+<div class="section" id="id4">
+<h3>Request URI<a class="headerlink" href="#id4" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>POST /{org_id}/{app_id}/groups/{uuid|groupname}/users/{uuid|username}/activities {request body}
+</pre></div>
+</div>
+<p>Parameters</p>
+<p>Parameter Description arg uuid|string org_id Organization UUID or
+organization name arg uuid|string app_id Application UUID or
+application name arg uuid|string groupname UUID or name of the group
+arg uuid|string username UUID or name of the user request body One or
+more sets of activity properties</p>
+<p>Example request body:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+  <span class="s">&quot;actor&quot;</span><span class="p">:</span>
+    <span class="p">{</span>
+    <span class="s">&quot;displayName&quot;</span><span class="p">:</span><span class="s">&quot;John Doe&quot;</span><span class="p">,</span>
+    <span class="s">&quot;uuid&quot;</span><span class="p">:</span><span class="s">&quot;1f3567aa-da83-11e1-afad-12313b01d5c1&quot;</span><span class="p">,</span>
+    <span class="s">&quot;username&quot;</span><span class="p">:</span><span class="s">&quot;john.doe&quot;</span><span class="p">,</span>
+    <span class="s">&quot;image&quot;</span><span class="p">:{</span>
+      <span class="s">&quot;duration&quot;</span><span class="p">:</span><span class="mi">0</span><span class="p">,</span>
+      <span class="s">&quot;height&quot;</span><span class="p">:</span><span class="mi">80</span><span class="p">,</span>
+      <span class="s">&quot;url&quot;</span><span class="p">:</span><span class="s">&quot;http://www.gravatar.com/avatar/&quot;</span><span class="p">,</span><span class="s">&quot;width&quot;</span><span class="p">:</span><span class="mi">80</span><span class="p">},</span>
+  <span class="s">&quot;email&quot;</span><span class="p">:</span><span class="s">&quot;john.doe@gmail.com&quot;</span><span class="p">},</span>
+  <span class="s">&quot;verb&quot;</span><span class="p">:</span><span class="s">&quot;post&quot;</span><span class="p">,</span>
+  <span class="s">&quot;content&quot;</span><span class="p">:</span><span class="s">&quot;Hello World!&quot;</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="id5">
+<h3>Example - Request<a class="headerlink" href="#id5" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X POST &quot;https://api.usergrid.com/my-org/my-app/groups/mygroup/users/john.doe/activities&quot; -d &#39;{&quot;actor&quot;:{&quot;displayName&quot;:&quot;John Doe&quot;,&quot;uuid&quot;:&quot;1f3567aa-da83-11e1-afad-12313b01d5c1&quot;,&quot;username&quot;:&quot;john.doe&quot;, &quot;image&quot;:{&quot;duration&quot;:0,&quot;height&quot;:80,&quot;url&quot;:&quot;http://www.gravatar.com/avatar/&quot;,&quot;width&quot;:80}, &quot;email&quot;:&quot;john.doe@gmail.com&quot;},&quot;verb&quot;:&quot;post&quot;,&quot;content&quot;:&quot;Hello World!&quot;}&#39;
+</pre></div>
+</div>
+<p>Because this relationship exists, this activity will appear in the feed
+of all users who are members of mygroup. It won&#8217;t appear in the feeds of
+the group members’ followers or in feeds of users they follow.</p>
+</div>
+<div class="section" id="id6">
+<h3>Example - Response<a class="headerlink" href="#id6" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>{
+  &quot;action&quot; : &quot;post&quot;,
+  &quot;application&quot; : &quot;3400ba10-cd0c-11e1-bcf7-12313d1c4491&quot;,
+  &quot;params&quot; : { },
+  &quot;path&quot; : &quot;/groups/d87edec7-fc4d-11e1-9917-12313d1520f1/users/34e26bc9-2d00-11e2-a065-02e81ae640dc/activities&quot;,
+  &quot;uri&quot; : &quot;https://api.usergrid.com/my-org/my-app/
+/groups/d87edec7-fc4d-11e1-9917-12313d1520f1/users/34e26bc9-2d00-11e2-a065-02e81ae640dc/activities&quot;,
+  &quot;entities&quot; : [ {
+    &quot;uuid&quot; : &quot;2440ca58-49ff-11e2-84c0-02e81adcf3d0&quot;,
+    &quot;type&quot; : &quot;activity&quot;,
+    &quot;created&quot; : 1355937094825,
+    &quot;modified&quot; : 1355937094825,
+    &quot;actor&quot; : {
+      &quot;displayName&quot; : &quot;John Doe&quot;,
+      &quot;uuid&quot; : &quot;1f3567aa-da83-11e1-afad-12313b01d5c1&quot;,
+      &quot;username&quot; : &quot;john.doe&quot;,
+      &quot;image&quot; : {
+        &quot;duration&quot; : 0,
+        &quot;height&quot; : 80,
+        &quot;url&quot; : &quot;http://www.gravatar.com/avatar/&quot;,
+        &quot;width&quot; : 80
+      },
+      &quot;email&quot; : &quot;john.doe@gmail.com&quot;
+    },
+    &quot;content&quot; : &quot;Happy New Year!&quot;,
+    &quot;metadata&quot; : {
+      &quot;path&quot; : &quot;/groups/d87edec7-fc4d-11e1-9917-12313d1520f1/users/34e26bc9-2d00-11e2-a065-02e81ae640dc/activities/2440ca58-49ff-11e2-84c0-02e81adcf3d0&quot;
+    },
+    &quot;published&quot; : 1355937094825,
+    &quot;verb&quot; : &quot;post&quot;
+  } ],
+  &quot;timestamp&quot; : 1355937094789,
+  &quot;duration&quot; : 95,
+  &quot;organization&quot; : &quot;my-org&quot;,
+  &quot;applicationName&quot; : &quot;my-app&quot;
+}
+</pre></div>
+</div>
+</div>
+</div>
+<div class="section" id="retrieving-activity-feeds">
+<h2>Retrieving activity feeds<a class="headerlink" href="#retrieving-activity-feeds" title="Permalink to this headline">¶</a></h2>
+<p>Retrieving a user&#8217;s activity feed</p>
+<p>Use the GET method to retrieve a user’s feed.</p>
+<div class="section" id="id7">
+<h3>Request URI<a class="headerlink" href="#id7" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">GET</span> <span class="o">/</span><span class="p">{</span><span class="n">org_id</span><span class="p">}</span><span class="o">/</span><span class="p">{</span><span class="n">app_id</span><span class="p">}</span><span class="o">/</span><span class="n">users</span><span class="o">/</span><span class="p">{</span><span class="n">uuid</span><span class="o">|</span><span class="n">username</span><span class="p">}</span><span class="o">/</span><span class="n">feed</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="id8">
+<h3>Example - Request<a class="headerlink" href="#id8" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X GET &quot;https://api.usergrid.com/my-org/my-app/users/john.doe/feed&quot;
+</pre></div>
+</div>
+</div>
+<div class="section" id="id9">
+<h3>Example - Response<a class="headerlink" href="#id9" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+  <span class="s">&quot;action&quot;</span> <span class="p">:</span> <span class="s">&quot;get&quot;</span><span class="p">,</span>
+  <span class="s">&quot;application&quot;</span> <span class="p">:</span> <span class="s">&quot;3400ba10-cd0c-11e1-bcf7-12313d1c44914&quot;</span><span class="p">,</span>
+  <span class="s">&quot;params&quot;</span> <span class="p">:</span> <span class="p">{},</span>
+  <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/d9693ec3-61c9-11e2-9ffc-02e81adcf3d0/feed&quot;</span><span class="p">,</span>
+  <span class="s">&quot;uri&quot;</span> <span class="p">:</span> <span class="s">&quot;https://api.usergrid.com/3400ba10-cd0c-11e1-bcf7-12313d1c44914/users/d9693ec3-61c9-11e2-9ffc-02e81adcf3d0/feed&quot;</span><span class="p">,</span>
+  <span class="s">&quot;entities&quot;</span> <span class="p">:</span> <span class="p">[</span> <span class="p">{</span>
+    <span class="s">&quot;uuid&quot;</span> <span class="p">:</span> <span class="s">&quot;ffd79647-f399-11e1-aec3-12313b06ae01&quot;</span><span class="p">,</span>
+    <span class="s">&quot;type&quot;</span> <span class="p">:</span> <span class="s">&quot;activity&quot;</span><span class="p">,</span>
+    <span class="s">&quot;created&quot;</span> <span class="p">:</span> <span class="mi">1346437854569</span><span class="p">,</span>
+    <span class="s">&quot;modified&quot;</span> <span class="p">:</span> <span class="mi">1346437854569</span><span class="p">,</span>
+    <span class="s">&quot;actor&quot;</span> <span class="p">:</span> <span class="p">{</span>
+      <span class="s">&quot;displayName&quot;</span> <span class="p">:</span> <span class="s">&quot;John Doe&quot;</span><span class="p">,</span>
+      <span class="s">&quot;image&quot;</span> <span class="p">:</span> <span class="p">{</span>
+        <span class="s">&quot;duration&quot;</span> <span class="p">:</span> <span class="mi">0</span><span class="p">,</span>
+        <span class="s">&quot;height&quot;</span> <span class="p">:</span> <span class="mi">80</span><span class="p">,</span>
+        <span class="s">&quot;url&quot;</span> <span class="p">:</span> <span class="s">&quot;http://www.gravatar.com/avatar/&quot;</span><span class="p">,</span>
+        <span class="s">&quot;width&quot;</span> <span class="p">:</span> <span class="mi">80</span>
+      <span class="p">},</span>
+      <span class="s">&quot;uuid&quot;</span> <span class="p">:</span> <span class="s">&quot;d9693ec3-61c9-11e2-9ffc-02e81adcf3d0&quot;</span><span class="p">,</span>
+      <span class="s">&quot;email&quot;</span> <span class="p">:</span> <span class="s">&quot;john.doe@gmail.com&quot;</span><span class="p">,</span>
+      <span class="s">&quot;username&quot;</span> <span class="p">:</span> <span class="s">&quot;john.doe&quot;</span>
+    <span class="p">},</span>
+    <span class="s">&quot;content&quot;</span> <span class="p">:</span> <span class="s">&quot;Hello World!&quot;</span><span class="p">,</span>
+    <span class="s">&quot;metadata&quot;</span> <span class="p">:</span> <span class="p">{</span>
+      <span class="s">&quot;cursor&quot;</span> <span class="p">:</span> <span class="s">&quot;gGkAAQMAgGkABgE5ffM1aQCAdQAQ_9eWR_OZEeGuwxIxOwauAQCAdQAQABlaOvOaEeGuwxIxOwauAQA&quot;</span><span class="p">,</span>
+      <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/d9693ec3-61c9-11e2-9ffc-02e81adcf3d0/feed/ffd79647-f399-11e1-aec3-12313b06ae01&quot;</span>
+    <span class="p">},</span>
+    <span class="s">&quot;published&quot;</span> <span class="p">:</span> <span class="mi">1346437854569</span><span class="p">,</span>
+    <span class="s">&quot;verb&quot;</span> <span class="p">:</span> <span class="s">&quot;post&quot;</span>
+  <span class="p">},</span> <span class="p">{</span>
+    <span class="s">&quot;uuid&quot;</span> <span class="p">:</span> <span class="s">&quot;2482a1c5-e7d0-11e1-96f6-12313b06d112&quot;</span><span class="p">,</span>
+    <span class="s">&quot;type&quot;</span> <span class="p">:</span> <span class="s">&quot;activity&quot;</span><span class="p">,</span>
+    <span class="s">&quot;created&quot;</span> <span class="p">:</span> <span class="mi">1345141694958</span><span class="p">,</span>
+    <span class="s">&quot;modified&quot;</span> <span class="p">:</span> <span class="mi">1345141694958</span><span class="p">,</span>
+    <span class="s">&quot;actor&quot;</span> <span class="p">:</span> <span class="p">{</span>
+      <span class="s">&quot;displayName&quot;</span> <span class="p">:</span> <span class="s">&quot;moab&quot;</span><span class="p">,</span>
+      <span class="s">&quot;image&quot;</span> <span class="p">:</span> <span class="p">{</span>
+        <span class="s">&quot;duration&quot;</span> <span class="p">:</span> <span class="mi">0</span><span class="p">,</span>
+        <span class="s">&quot;height&quot;</span> <span class="p">:</span> <span class="mi">80</span><span class="p">,</span>
+        <span class="s">&quot;url&quot;</span> <span class="p">:</span> <span class="s">&quot;http://www.gravatar.com/avatar/&quot;</span><span class="p">,</span>
+        <span class="s">&quot;width&quot;</span> <span class="p">:</span> <span class="mi">80</span>
+      <span class="p">},</span>
+      <span class="s">&quot;uuid&quot;</span> <span class="p">:</span> <span class="s">&quot;d9693ec3-61c9-11e2-9ffc-02e81adcf3d0&quot;</span><span class="p">,</span>
+      <span class="s">&quot;email&quot;</span> <span class="p">:</span> <span class="s">&quot;massoddb@mfdsadfdsaoabl.com&quot;</span><span class="p">,</span>
+      <span class="s">&quot;username&quot;</span> <span class="p">:</span> <span class="s">&quot;moab&quot;</span>
+    <span class="p">},</span>
+    <span class="s">&quot;content&quot;</span> <span class="p">:</span> <span class="s">&quot;checking in code left and right!!&quot;</span><span class="p">,</span>
+    <span class="s">&quot;metadata&quot;</span> <span class="p">:</span> <span class="p">{</span>
+      <span class="s">&quot;cursor&quot;</span> <span class="p">:</span> <span class="s">&quot;gGkAAQMAgGkABgE5MLFh7gCAdQAQJIKhxefQEeGW9hIxOwbREgCAdQAQJNEP6ufQEeGW9hIxOwbREgA&quot;</span><span class="p">,</span>
+      <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/d9693ec3-61c9-11e2-9ffc-02e81adcf3d0/feed/2482a1c5-e7d0-11e1-96f6-12313b06d112&quot;</span>
+    <span class="p">},</span>
+    <span class="s">&quot;published&quot;</span> <span class="p">:</span> <span class="mi">1345141694958</span><span class="p">,</span>
+    <span class="s">&quot;verb&quot;</span> <span class="p">:</span> <span class="s">&quot;post&quot;</span>
+  <span class="p">}</span> <span class="p">],</span>
+  <span class="s">&quot;timestamp&quot;</span> <span class="p">:</span> <span class="mi">1346438331316</span><span class="p">,</span>
+  <span class="s">&quot;duration&quot;</span> <span class="p">:</span> <span class="mi">144</span><span class="p">,</span>
+  <span class="s">&quot;organization&quot;</span><span class="p">:</span> <span class="s">&quot;my-org&quot;</span><span class="p">,</span>
+  <span class="s">&quot;applicationName&quot;</span><span class="p">:</span> <span class="s">&quot;my-app&quot;</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+</div>
+<div class="section" id="retrieving-a-group-s-activity-feed">
+<h2>Retrieving a group&#8217;s activity feed<a class="headerlink" href="#retrieving-a-group-s-activity-feed" title="Permalink to this headline">¶</a></h2>
+<p>Use the GET method to retrieve the feed for a group. This gets a list of
+all the activities that have been posted to this group, that is, the
+activities for which this group has a relationship (owns).</p>
+<div class="section" id="id10">
+<h3>Request URI<a class="headerlink" href="#id10" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">GET</span> <span class="o">/</span><span class="p">{</span><span class="n">org_id</span><span class="p">}</span><span class="o">/</span><span class="p">{</span><span class="n">app_id</span><span class="p">}</span><span class="o">/</span><span class="n">groups</span><span class="o">/</span><span class="p">{</span><span class="n">uuid</span><span class="o">|</span><span class="n">groupname</span><span class="p">}</span><span class="o">/</span><span class="n">feed</span>
+</pre></div>
+</div>
+<p>Parameters</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="24%" />
+<col width="76%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>arg uuid|str</td>
+<td>ing org_id Organization UUID or organization name</td>
+</tr>
+<tr class="row-odd"><td>arg uuid|str</td>
+<td>ing app_id Application UUID or application name</td>
+</tr>
+<tr class="row-even"><td>arg uuid|str</td>
+<td>ing groupname UUID or name of the group</td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="section" id="id11">
+<h3>Example - Request<a class="headerlink" href="#id11" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X GET &quot;https://api.usergrid.com/my-org/my-app/groups/mygroup/feed&quot;
+</pre></div>
+</div>
+</div>
+<div class="section" id="id12">
+<h3>Example - Response<a class="headerlink" href="#id12" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+    <span class="s">&quot;action&quot;</span><span class="p">:</span> <span class="s">&quot;get&quot;</span><span class="p">,</span>
+    <span class="s">&quot;application&quot;</span><span class="p">:</span> <span class="s">&quot;3400ba10-cd0c-11e1-bcf7-12313d1c4491&quot;</span><span class="p">,</span>
+    <span class="s">&quot;params&quot;</span><span class="p">:</span>  <span class="p">{},</span>
+    <span class="s">&quot;path&quot;</span><span class="p">:</span> <span class="s">&quot;/groups/d87edec7-fc4d-11e1-9917-12313d1520f1/feed&quot;</span><span class="p">,</span>
+    <span class="s">&quot;uri&quot;</span><span class="p">:</span> <span class="s">&quot;https://api.usergrid.com/my-org/my-app/groups/d87edec7-fc4d-11e1-9917-12313d1520f1/feed&quot;</span><span class="p">,</span>
+    <span class="s">&quot;entities&quot;</span><span class="p">:</span>  <span class="p">[</span>
+       <span class="p">{</span>
+        <span class="s">&quot;uuid&quot;</span><span class="p">:</span> <span class="s">&quot;563f5d96-37f3-11e2-a0f7-02e81ae640dc&quot;</span><span class="p">,</span>
+        <span class="s">&quot;type&quot;</span><span class="p">:</span> <span class="s">&quot;activity&quot;</span><span class="p">,</span>
+        <span class="s">&quot;created&quot;</span><span class="p">:</span> <span class="mi">1353952903811</span><span class="p">,</span>
+        <span class="s">&quot;modified&quot;</span><span class="p">:</span> <span class="mi">1353952903811</span><span class="p">,</span>
+        <span class="s">&quot;actor&quot;</span><span class="p">:</span>  <span class="p">{</span>
+          <span class="s">&quot;displayName&quot;</span><span class="p">:</span> <span class="s">&quot;John Doe&quot;</span><span class="p">,</span>
+          <span class="s">&quot;image&quot;</span><span class="p">:</span>  <span class="p">{</span>
+            <span class="s">&quot;duration&quot;</span><span class="p">:</span> <span class="mi">0</span><span class="p">,</span>
+            <span class="s">&quot;height&quot;</span><span class="p">:</span> <span class="mi">80</span><span class="p">,</span>
+            <span class="s">&quot;url&quot;</span><span class="p">:</span> <span class="s">&quot;http://www.gravatar.com/avatar/&quot;</span><span class="p">,</span>
+            <span class="s">&quot;width&quot;</span><span class="p">:</span> <span class="mi">80</span>
+          <span class="p">},</span>
+          <span class="s">&quot;uuid&quot;</span><span class="p">:</span> <span class="s">&quot;1f3567aa-da83-11e1-afad-12313b01d5c1&quot;</span><span class="p">,</span>
+          <span class="s">&quot;email&quot;</span><span class="p">:</span> <span class="s">&quot;john.doe@gmail.com&quot;</span><span class="p">,</span>
+        <span class="s">&quot;username&quot;</span><span class="p">:</span> <span class="s">&quot;john.doe&quot;</span>
+        <span class="p">},</span>
+        <span class="s">&quot;content&quot;</span><span class="p">:</span> <span class="s">&quot;Hello World!&quot;</span><span class="p">,</span>
+        <span class="s">&quot;metadata&quot;</span><span class="p">:</span>  <span class="p">{</span>
+          <span class="s">&quot;cursor&quot;</span><span class="p">:</span> <span class="s">&quot;gGkAAQMAgGkABgE7PeHCgwCAdQAQVj9dljfzEeKg9wLoGuZA3ACAdQAQVkVRCTfzEeKg9wLoGuZA3AA&quot;</span><span class="p">,</span>
+          <span class="s">&quot;path&quot;</span><span class="p">:</span> <span class="s">&quot;/groups/d87edec7-fc4d-11e1-9917-12313d1520f1/feed/563f5d96-37f3-11e2-a0f7-02e81ae640dc&quot;</span>
+        <span class="p">},</span>
+        <span class="s">&quot;published&quot;</span><span class="p">:</span> <span class="mi">1353952903811</span><span class="p">,</span>
+        <span class="s">&quot;verb&quot;</span><span class="p">:</span> <span class="s">&quot;post&quot;</span>
+      <span class="p">}</span>
+    <span class="p">],</span>
+  <span class="s">&quot;timestamp&quot;</span><span class="p">:</span> <span class="mi">1353953272756</span><span class="p">,</span>
+  <span class="s">&quot;duration&quot;</span><span class="p">:</span> <span class="mi">29</span><span class="p">,</span>
+  <span class="s">&quot;organization&quot;</span><span class="p">:</span> <span class="s">&quot;my-org&quot;</span><span class="p">,</span>
+  <span class="s">&quot;applicationName&quot;</span><span class="p">:</span> <span class="s">&quot;my-app&quot;</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+</div>
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+      
+        <a href="user-connections.html" class="btn btn-neutral float-right" title="Social Graph Connections" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+      
+      
+        <a href="group.html" class="btn btn-neutral" title="Working with group data" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+      
+    </div>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

[42/60] [abbrv] incubator-usergrid git commit: For review purposes.

[sn...@apache.org]

For review purposes.

(cherry picked from commit 891578f8acfbc315da4817b6ef04d12fd98bb994)


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/24aa4da8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/24aa4da8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/24aa4da8

Branch: refs/heads/two-dot-o-dev
Commit: 24aa4da80940cec899f9286835018e3570526b45
Parents: 4a92ab0
Author: Dave Johnson <sn...@apache.org>
Authored: Wed Aug 5 11:30:33 2015 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Wed Aug 12 13:02:43 2015 -0400

----------------------------------------------------------------------
 content/docs/rest-endpoints/api-reference.html | 5867 +++++++++++++++++++
 docs/rest-endpoints/api-docs.html              | 5867 -------------------
 2 files changed, 5867 insertions(+), 5867 deletions(-)
----------------------------------------------------------------------

[49/60] [abbrv] incubator-usergrid git commit: Fixing more missing references.

[sn...@apache.org]

Fixing more missing references.

(cherry picked from commit fa4c74aa2630193dfc15d33dc959d30211419330)


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/16306f42
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/16306f42
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/16306f42

Branch: refs/heads/two-dot-o-dev
Commit: 16306f428ef2402c254ff884d48e98def5e6f86c
Parents: d54b0fb
Author: Dave Johnson <sn...@apache.org>
Authored: Thu Aug 6 13:10:32 2015 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Wed Aug 12 13:02:47 2015 -0400

----------------------------------------------------------------------
 docs/data-queries/operators-and-types.md                 |  2 +-
 docs/data-queries/query-parameters.md                    |  2 +-
 docs/data-queries/querying-your-data.md                  |  2 +-
 docs/data-storage/collections.md                         |  8 ++++----
 docs/data-storage/data-store-dbms.md                     |  4 ++--
 docs/data-storage/entities.md                            | 10 +++++-----
 docs/entity-connections/retrieving-entities.md           |  9 ++++-----
 docs/geolocation/geolocation.md                          |  2 +-
 docs/getting-started/creating-a-new-application.md       |  6 ++++--
 docs/getting-started/creating-account.md                 |  6 +++---
 docs/getting-started/using-a-sandbox-app.md              |  2 +-
 docs/getting-started/using-the-api.md                    |  2 +-
 docs/index.rst                                           |  2 +-
 docs/introduction/data-model.md                          |  2 +-
 docs/orgs-and-apps/application.md                        |  2 +-
 docs/security-and-auth/authenticating-api-requests.md    |  6 +++---
 .../authenticating-users-and-application-clients.md      |  6 +++---
 docs/security-and-auth/facebook-sign.md                  |  2 +-
 docs/security-and-auth/user-authentication-types.md      |  6 +++---
 docs/security-and-auth/using-permissions.md              |  2 +-
 docs/security-and-auth/using-roles.md                    |  2 +-
 docs/user-management/activity.md                         | 11 +++++------
 22 files changed, 48 insertions(+), 48 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/16306f42/docs/data-queries/operators-and-types.md
----------------------------------------------------------------------
diff --git a/docs/data-queries/operators-and-types.md b/docs/data-queries/operators-and-types.md
index c67ccd1..bb42107 100644
--- a/docs/data-queries/operators-and-types.md
+++ b/docs/data-queries/operators-and-types.md
@@ -64,7 +64,7 @@ As you develop queries, remember that entity properties each conform to a partic
 
 For example, if you create an entity with a price property with a value of 100.00, querying for 100 will return no results, since the API expected a decimal-delimited float value in your query.
 
-For a list of property data types for each default entities, see Default Data Entity Types.
+For a list of property data types for each default entities, see [Default Data Entities](../rest-endpoints/api-doc.html#models)s.
 
 <table class="usergrid-table">
     <tr>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/16306f42/docs/data-queries/query-parameters.md
----------------------------------------------------------------------
diff --git a/docs/data-queries/query-parameters.md b/docs/data-queries/query-parameters.md
index 9f9fc68..944c27b 100644
--- a/docs/data-queries/query-parameters.md
+++ b/docs/data-queries/query-parameters.md
@@ -48,7 +48,7 @@ The following table lists a few examples of the kind of searches you can do in q
 
 ### Location
 
-If you've stored location data with your entities, you can query for the proximity of the geographical locations those entities represent. For more information on geolocation, see Geolocation.
+If you've stored location data with your entities, you can query for the proximity of the geographical locations those entities represent. For more information on geolocation, see [Geolocation](../geolocation/geolocation.html).
 
 <table class="usergrid-table">
     <tr>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/16306f42/docs/data-queries/querying-your-data.md
----------------------------------------------------------------------
diff --git a/docs/data-queries/querying-your-data.md b/docs/data-queries/querying-your-data.md
index fa10169..2da961d 100644
--- a/docs/data-queries/querying-your-data.md
+++ b/docs/data-queries/querying-your-data.md
@@ -42,7 +42,7 @@ For example, the following request returns the address and phone number of users
 
 When you query your data, the API response is formatted in JavaScript Object Notation (JSON). This is a common format used for parameter and return values in REST web services.
 
-Data corresponding to the response is captured in the response’s entities array. The array will include one JSON-object for each entity returned for the query. Each returned entity will include a number of default properties, including the UUID of the entity, the entity type, and values for properties such as name, username, email, and so on. For a complete list of default properties by entity type, see Default Data Entity Types.
+Data corresponding to the response is captured in the response’s entities array. The array will include one JSON-object for each entity returned for the query. Each returned entity will include a number of default properties, including the UUID of the entity, the entity type, and values for properties such as name, username, email, and so on. For a complete list of default properties by entity type, see [Default Data Entities](../rest-endpoints/api-doc.html#models).
 
 For example, the following query for all entities of type user where the name property equals 'Gladys Kravitz':
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/16306f42/docs/data-storage/collections.md
----------------------------------------------------------------------
diff --git a/docs/data-storage/collections.md b/docs/data-storage/collections.md
index c072104..fa8652e 100644
--- a/docs/data-storage/collections.md
+++ b/docs/data-storage/collections.md
@@ -4,7 +4,7 @@
 
 This article describes how to create collections in Advanced Usergrid. All entities are automatically associated with a corresponding collection based on the type property of the entity. You may create empty collections if you wish, but creating an entity of a new type will automatically create a corresponding collection for you. For example, creating a new custom "item" entity, creates an "items" collection.
 
-__Note__: Although not shown in the API examples below, you need to provide a valid access token with each API call. See Authenticating users and application clients for details.
+__Note__: Although not shown in the API examples below, you need to provide a valid access token with each API call. See [Authenticating users and application clients](../security-and-auth/authenticating-users-and-application-clients.html) for details.
 
 ### Creating a collection
 
@@ -51,7 +51,7 @@ This article describes how to retrieve all of the entities in a collection.
 
 <div class="admonition note"> <p class="first admonition-title">Note</p> <p class="last">
By default, the Usergrid API returns 10 entities per request. For collections with more than 10 entities, use the returned 'cursor' property to retrieve the next 10 entities in the result set. You may also use the LIMIT parameter in a query string to increase the number of results returned. For more information on using cursors, see [Query Parameters](../data-queries/query-parameters.html).</p></div>
 
-__Note__: Although not shown in the API examples below, you need to provide a valid access token with each API call. See Authenticating users and application clients for details.
+__Note__: Although not shown in the API examples below, you need to provide a valid access token with each API call. See [Authenticating users and application clients](../security-and-auth/authenticating-users-and-application-clients.html) for details.
 
 ### Retrieving sets of entities from a collection
 
@@ -115,7 +115,7 @@ Response:
 
 This article describes how to perform batch updates on all entities in a collection. Batch updates require the use of a query string in the request, which can either specify all entities in the collection or a subset of entities for the update to be performed on. For more information on queries, see Querying your data.
 
-__Note__: Although not shown in the API examples below, you need to provide a valid access token with each API call. See Authenticating users and application clients for details.
+__Note__: Although not shown in the API examples below, you need to provide a valid access token with each API call. See [Authenticating users and application clients](../security-and-auth/authenticating-users-and-application-clients.html) for details.
 
 ### Batch updating entities in a collection
 
@@ -185,7 +185,7 @@ This article describes how to batch delete entities in a collection. Batch delet
 
 Currently, collections cannot be deleted; however, you can delete all of the entities from a collection.
 
-__Note__: Although not shown in the API examples below, you need to provide a valid access token with each API call. See Authenticating users and application clients for details.
+__Note__: Although not shown in the API examples below, you need to provide a valid access token with each API call. See [Authenticating users and application clients](../security-and-auth/authenticating-users-and-application-clients.html) for details.
 
 ### Batch deleting entities in a collection
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/16306f42/docs/data-storage/data-store-dbms.md
----------------------------------------------------------------------
diff --git a/docs/data-storage/data-store-dbms.md b/docs/data-storage/data-store-dbms.md
index 539cca6..0ea09d4 100644
--- a/docs/data-storage/data-store-dbms.md
+++ b/docs/data-storage/data-store-dbms.md
@@ -4,10 +4,10 @@ The Usergrid data store is backed by Cassandra, an open source distributed DBMS.
 
 <!-- workaround a Sphinx bug -->
 <div class="admonition note"> <p class="first admonition-title">Note</p> <p class="last">
-Usergrid is not a relational database. Optimizing for performance on a non-relational database like Cassandra differs a bit from relational databases. For more information, see Optimizing access to your Usergrid data store.</p> </div>
+Usergrid is not a relational database. Optimizing for performance on a non-relational database like Cassandra differs a bit from relational databases. For more information, see [Optimizing access to your Usergrid data store](../data-storage/optimizing-access.html).</p> </div>
 
 
-Cassandra is specifically designed to support applications that need flexibility and high scalability, particularly web and mobile applications. Usergrid client applications write and read data formatted as JavaScript Object Notation (JSON). (Usergrid provides SDKs through which client apps can do much of this work in their native language. For more information, see Usergrid SDKs.)
+Cassandra is specifically designed to support applications that need flexibility and high scalability, particularly web and mobile applications. Usergrid client applications write and read data formatted as JavaScript Object Notation (JSON). (Usergrid provides SDKs through which client apps can do much of this work in their native language. For more information, see [Usergrid SDKs](../sdks/tbd.html).)
 
 With Cassandra as the underlying DBMS, apps benefit from:
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/16306f42/docs/data-storage/entities.md
----------------------------------------------------------------------
diff --git a/docs/data-storage/entities.md b/docs/data-storage/entities.md
index 5a70b18..be77ebd 100644
--- a/docs/data-storage/entities.md
+++ b/docs/data-storage/entities.md
@@ -5,7 +5,7 @@ This article describes how to create custom data entities and entity properties.
 
 The methods cited in this article should be used to create custom data entities. If you are using one of the Usergrid SDKs, use one of the entity type-specific SDK methods to create default data entities.
 
-__Note__: Although not shown in the API examples below, you need to provide a valid access token with each API call. See Authenticating users and application clients for details.
+__Note__: Although not shown in the API examples below, you need to provide a valid access token with each API call. See [Authenticating users and application clients](../security-and-auth/authenticating-users-and-application-clients.html) for details.
 
 ### Creating a custom entity
 When a new entity is created, Usergrid will automatically create a corresponding collection if one does not already exist. The collection will automatically be named with the plural form of the entity type. For example, creating a custom entity of type 'item' will automatically create a collection named 'items' in which all future 'item' entities will be saved.
@@ -144,7 +144,7 @@ Any valid JSON object can be stored in an entity, regardless of the level of com
 ### Updating sub-properties
 
 An array of sub-properties is treated as a single object. This means that sub-properties cannot be updated atomically. All sub-properties of a given property must be updated as a set.
-For more on updating an existing sub-property, see Updating Data Entities.
+For more on updating an existing sub-property, see [Updating Data Entities](../data-storage/entities.html#updating-data-entities).
 
 Example Request/Response
 
@@ -193,7 +193,7 @@ Example Request/Response
 ## Retrieving Data Entities
 This article describes how to retrieve entities from your account.
 
-__Note__: Although not shown in the API examples below, you need to provide a valid access token with each API call. See Authenticating users and application clients for details.
+__Note__: Although not shown in the API examples below, you need to provide a valid access token with each API call. See [Authenticating users and application clients](../security-and-auth/authenticating-users-and-application-clients.html) for details.
 
 With the exception of the user entity, all data entities can be retrieved by using their UUID or a 'name' property. The user entity can be retrieved by UUID or the 'username' property. The value for the 'name' or 'username' property must be unique.
 
@@ -333,7 +333,7 @@ Response:
 
 This article describes how to update entities in your account.
 
-__Note__: Although not shown in the API examples below, you need to provide a valid access token with each API call. See Authenticating users and application clients for details.
+__Note__: Although not shown in the API examples below, you need to provide a valid access token with each API call. See [Authenticating users and application clients](../security-and-auth/authenticating-users-and-application-clients.html) for details.
 
 ### Updating an entity
 One or more properties can be updated with a single PUT request. For information on updating sub-properties, see Updating sub-properties below.
@@ -454,7 +454,7 @@ Response:
 
 This article describes how to delete data entities.
 
-__Note__:Although not shown in the API examples below, you need to provide a valid access token with each API call. See Authenticating users and application clients for details.
+__Note__:Although not shown in the API examples below, you need to provide a valid access token with each API call. See [Authenticating users and application clients](../security-and-auth/authenticating-users-and-application-clients.html) for details.
 
 ### Deleting an entity
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/16306f42/docs/entity-connections/retrieving-entities.md
----------------------------------------------------------------------
diff --git a/docs/entity-connections/retrieving-entities.md b/docs/entity-connections/retrieving-entities.md
index 31eaf9c..6da8577 100644
--- a/docs/entity-connections/retrieving-entities.md
+++ b/docs/entity-connections/retrieving-entities.md
@@ -1,13 +1,12 @@
 # Retrieving connections
 
-Viewing all of an entities connections
 To see all of the connection types associated with an entity, simply retrieve the entity.
 
-All of the connection types the entity has made to other entities will appear in the metadata.connections property.
+All of the connection types the entity has made to other entities will appear in the ``metadata.connections`` property.
 
-All of the connection types that other entities have made to the entity will appear in the metadata.connecting property.
+All of the connection types that other entities have made to the entity will appear in the ``metadata.connecting`` property.
 
-For user entities, following/followers connections can be accessed by sending a GET request to the URL in the collections.following and collections.followers properties.
+For user entities, following/followers connections can be accessed by sending a ``GET`` request to the URL in the ``collections.following`` and ``collections.follower``s properties.
 
 Retrieve connected entities by connection type
 To get a list of entities a specified entity has connected to with a specific connection type, do the following:
@@ -83,7 +82,7 @@ All of the entities that have made a connection of that type to the specified en
 
 ## Retrieve all connecting entities by type
 
-To get a list of all the entities that have created a connection of a specific type to a specified entity, use the same method as shown above in Retrieve connected entities by connection type, and set the relationship to connecting/<relationship>.
+To get a list of all the entities that have created a connection of a specific type to a specified entity, use the same method as shown above in Retrieve connected entities by connection type, and set the relationship to ``connecting/<relationship>``.
 
 All of the entities that have made a connection to the specified entity will be returned in the entities property of the response.
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/16306f42/docs/geolocation/geolocation.md
----------------------------------------------------------------------
diff --git a/docs/geolocation/geolocation.md b/docs/geolocation/geolocation.md
index ede4e3c..3da555c 100644
--- a/docs/geolocation/geolocation.md
+++ b/docs/geolocation/geolocation.md
@@ -36,7 +36,7 @@ Location-aware apps require the ability to return content and results based on t
 	
 The returned results are sorted from nearest to furthest. Entities with the same location are returned in the order they were created.
 
-The location parameter can be appended to any standard API Services query. For more information on how to query your API Services data, see Querying your data.
+The location parameter can be appended to any standard API Services query. For more information on how to query your API Services data, see [Querying your Data](../data-queries/querying-your-data.html).
 
 For example, here is how you would find all the devices within 8,046 meters (~10 miles) of the center of San Francisco:
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/16306f42/docs/getting-started/creating-a-new-application.md
----------------------------------------------------------------------
diff --git a/docs/getting-started/creating-a-new-application.md b/docs/getting-started/creating-a-new-application.md
index cc5f577..ce5fb7a 100644
--- a/docs/getting-started/creating-a-new-application.md
+++ b/docs/getting-started/creating-a-new-application.md
@@ -8,7 +8,9 @@ To create a new application with the admin portal:
 1. In the admin portal, from the dropdown menu at the far top left, select the organization to which you will add the new application.
 1. Click the ADD NEW APP button, located at the top of the screen, next to the application drop-down.
 1. In the dialog box, enter a new application name, then click the Create button. Your new application will automatically be selected in the applications drop-down menu.
-Applications can also be created programmatically with a POST request to the API. For more, see Application.
+
+Applications can also be created programatically with a ``POST`` request to the API. For more, see [Application](../orgs-and-apps/application.html).
 
 ## Securing an application
-If this is going to be a production application, be sure to configure security roles that provide only the level of access your users will need. For more on security, see Security best practices.
\ No newline at end of file
+If this is going to be a production application, be sure to configure security roles that provide only the level of access your users will need. For more on security, see [Security Best Practices](../security-and-auth/securing-your-app.html)
+.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/16306f42/docs/getting-started/creating-account.md
----------------------------------------------------------------------
diff --git a/docs/getting-started/creating-account.md b/docs/getting-started/creating-account.md
index 1440926..f4f542a 100644
--- a/docs/getting-started/creating-account.md
+++ b/docs/getting-started/creating-account.md
@@ -3,7 +3,7 @@ To get started using the Usergrid, you'll need an Usergrid account. (Before read
 
 With an account, you get the following useful things:
 
-* A sandbox application you can try things with (we automatically create one for you with your new account). The sandbox is a partitioned area of the data store where you can add example data and try out API calls. The sandbox isn't secure, but it's handy to play in. For more about the sandbox, see "Using Your Application Sandbox".
+* A sandbox application you can try things with (we automatically create one for you with your new account). The sandbox is a partitioned area of the data store where you can add example data and try out API calls. The sandbox isn't secure, but it's handy to play in. For more about the sandbox, see [Using Your Application Sandbox](../getting-started/using-a-sandbox-app.html).
 * The ability to create more applications (in addition to the sandbox). You can (and should!) make these as secure as you need to. These are the applications that you'll have behind the apps you make available to your users.
 * Access to the Admin Portal. In the portal, you can do the following:
 ** Create and manage applications.
@@ -11,11 +11,11 @@ With an account, you get the following useful things:
 ** Manage the data in your app.
 ** Manage app features, including push notifications, activities, analytics, and so on.
 ** Try out API calls with a shell command window.
-** To create an Usergrid account and see a very short tutorial to get started with, go to the get started page.
+** To create an Usergrid account and see a very short tutorial to get started with, go to the get started page of the Portal.
 
 ## Next steps
 Ready to learn and do more?
 
-* Install an SDK that will be most useful for your application environment. For more about Usergrid's SDKs, see SDKs.
+* Install an SDK that will be most useful for your application environment. For more about Usergrid's SDKs, see [SDKs](../sdks/tbd.html).
 * Review Usergrid features for information on concepts and features.
 * Consult the API Reference for usage details.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/16306f42/docs/getting-started/using-a-sandbox-app.md
----------------------------------------------------------------------
diff --git a/docs/getting-started/using-a-sandbox-app.md b/docs/getting-started/using-a-sandbox-app.md
index 7fb9cd1..75c296f 100644
--- a/docs/getting-started/using-a-sandbox-app.md
+++ b/docs/getting-started/using-a-sandbox-app.md
@@ -2,7 +2,7 @@
 
 ## What is the sandbox application?
 
-When you create a new Usergrid account (see Creating an Usergrid Account) to use services for developers, Usergrid creates a new application for you on its servers. With the new application, called "sandbox," you can add your own example data and try out API calls that do things with the data. Be sure to see Using the API for suggestions.
+When you create a new Usergrid account (see [Creating an Usergrid Account](creating-account.html)) to use services for developers, Usergrid creates a new application for you on its servers. With the new application, called "sandbox," you can add your own example data and try out API calls that do things with the data. Be sure to see Using the API for suggestions.
 
 ## Is the sandbox secure?
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/16306f42/docs/getting-started/using-the-api.md
----------------------------------------------------------------------
diff --git a/docs/getting-started/using-the-api.md b/docs/getting-started/using-the-api.md
index 9a7ba2d..d85f86a 100644
--- a/docs/getting-started/using-the-api.md
+++ b/docs/getting-started/using-the-api.md
@@ -59,7 +59,7 @@ For example, this request retrieves users whose Facebook first name is john:
 
     /users?ql=select * where facebook.first_name ='john'
 
-For further information about queries, see Queries and parameters.
+For further information about queries, see [Querying your Data](../data-queries/querying-your-data.html)
 
 ## Authentication (OAuth)
 Usergrid implements the OAuth 2.0 standard for authenticating users, clients and API requests.

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/16306f42/docs/index.rst
----------------------------------------------------------------------
diff --git a/docs/index.rst b/docs/index.rst
index e3fab8f..bcb3092 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -18,8 +18,8 @@ Apache Usergrid Documentation
    :maxdepth: 2
    :caption: Getting Started
 
-   getting-started/creating-a-new-application
    getting-started/creating-account
+   getting-started/creating-a-new-application
    getting-started/using-a-sandbox-app
    getting-started/using-the-api.md
      

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/16306f42/docs/introduction/data-model.md
----------------------------------------------------------------------
diff --git a/docs/introduction/data-model.md b/docs/introduction/data-model.md
index 0278b97..111e225 100644
--- a/docs/introduction/data-model.md
+++ b/docs/introduction/data-model.md
@@ -8,7 +8,7 @@ An organization contains one or more applications, and represents administrator-
 An organization with the same name as your username is automatically created for you when you sign up. By default, you are assigned as the administrator of this organization.
 
 ## Applications
-In Usergrid, you can create one or more applications within an organization. Applications represent an instance of application data associated with an app, and you may create as many applications as you wish. This allows you to utilize the backend in a way that corresponds to your development process. For example, you might create separate applications for development and production instances of your app. By default, all organization have a sandbox application (see Using a Sandbox Application for important information regarding the default sandbox application).
+In Usergrid, you can create one or more applications within an organization. Applications represent an instance of application data associated with an app, and you may create as many applications as you wish. This allows you to utilize the backend in a way that corresponds to your development process. For example, you might create separate applications for development and production instances of your app. By default, all organization have a sandbox application (see Using a [Sandbox Application](../getting-started/using-a-sandbox-app.html) for important information regarding the default sandbox application).
 
 Each application provides the infrastructure for storing, retrieving, updating and deleting the entities and collections associated with a specific app instance.
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/16306f42/docs/orgs-and-apps/application.md
----------------------------------------------------------------------
diff --git a/docs/orgs-and-apps/application.md b/docs/orgs-and-apps/application.md
index 7495aee..801b9ef 100644
--- a/docs/orgs-and-apps/application.md
+++ b/docs/orgs-and-apps/application.md
@@ -1,5 +1,5 @@
 # Application
-You can create a new application in an organization through the Admin portal. The Admin portal creates the new application by issuing a post against the management endpoint (see the "Creating an organization application" section in Organization for details). If you need to create an application programmatically in your app, you can also use the API to do this. You can access application entities using your app name or UUID, prefixed with the organization name or UUID:
+You can create a new application in an organization through the Admin portal. The Admin portal creates the new application by issuing a post against the management endpoint (see the [Creating an Application](../orgs-and-apps/application.html#creating-an-application) section in Organization for details). If you need to create an application programmatically in your app, you can also use the API to do this. You can access application entities using your app name or UUID, prefixed with the organization name or UUID:
 
     https://api.usergrid.com/{org_name|uuid}/{app_name|uuid}
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/16306f42/docs/security-and-auth/authenticating-api-requests.md
----------------------------------------------------------------------
diff --git a/docs/security-and-auth/authenticating-api-requests.md b/docs/security-and-auth/authenticating-api-requests.md
index af52bf6..d29e4cb 100644
--- a/docs/security-and-auth/authenticating-api-requests.md
+++ b/docs/security-and-auth/authenticating-api-requests.md
@@ -4,7 +4,7 @@ With the exception of the 'sandbox' application that is created with every Userg
 
 This article describes how to use access tokens to access the Usergrid API, and how to manage access tokens, including revoking and changing token time to live.
 
-For information on generating access tokens/authenticating users and clients, see Authenticating users and application clients.
+For information on generating access tokens/authenticating users and clients, see [Authenticating users and application clients](../security-and-auth/authenticating-users-and-application-clients.html).
 
 ## Authenticating with access tokens
 When you obtain an access token, you must provide it with every subsequent API call that you make. There are two ways to provide your access token.
@@ -18,7 +18,7 @@ You can include the token in an HTTP authorization header:
     Authorization: Bearer {access_token}
 
 <div class="admonition note"> <p class="first admonition-title">Note</p> <p class="last">

-Note: The Usergrid documentation assumes you are providing a valid access token with every API call whether or not it is shown explicitly in the examples. Unless the documentation specifically says that you can access an API endpoint without an access token, you should assume that you must provide it. One application that does not require an access token is the sandbox application. The Guest role has been given full permissions (/** for GET, POST, PUT, and DELETE) for this application. This eliminates the need for a token when making application level calls to the sandbox app. For further information on specifying permissions, see Managing access by defining permission rules.
+Note: The Usergrid documentation assumes you are providing a valid access token with every API call whether or not it is shown explicitly in the examples. Unless the documentation specifically says that you can access an API endpoint without an access token, you should assume that you must provide it. One application that does not require an access token is the sandbox application. The Guest role has been given full permissions (/** for GET, POST, PUT, and DELETE) for this application. This eliminates the need for a token when making application level calls to the sandbox app. For further information on specifying permissions, see [Using Permissions](security-and-auth/using-permissions.html).
 </p></div>
 
 ## Authenticating with client ID and client secret
@@ -27,7 +27,7 @@ Another option for authenticating your API requests is using either your organiz
 
 <div class="admonition warning"> <p class="first admonition-title">WARNING</p> <p class="last">

 Warning: For server-side use only
-You should never authenticate this way from a client-side app such as a mobile app. A hacker could analyze your app and extract the credentials for malicious use even if those credentials are compiled and in binary format. See Security best practices for additional considerations in keeping access to your app and its data secure.
+You should never authenticate this way from a client-side app such as a mobile app. A hacker could analyze your app and extract the credentials for malicious use even if those credentials are compiled and in binary format. See [Security Best Practices](../security-and-auth/securing-your-app.html) for additional considerations in keeping access to your app and its data secure.
 </p></div>
 
 This can be a convenient way to authenticate API requests, since there is no need to generate and manage an access token, but please note that you should be very cautious when implementing this type of authentication. Organization-level authentication grants full permission to perform any supported call against your organization and every application in it, and application-level authentication grants full permission to perform any supported call against all of the resources in an application. Should your client id and client secret be compromised, a malicious user would gain broad access to your organization or application.

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/16306f42/docs/security-and-auth/authenticating-users-and-application-clients.md
----------------------------------------------------------------------
diff --git a/docs/security-and-auth/authenticating-users-and-application-clients.md b/docs/security-and-auth/authenticating-users-and-application-clients.md
index eaa52f4..e1ada48 100644
--- a/docs/security-and-auth/authenticating-users-and-application-clients.md
+++ b/docs/security-and-auth/authenticating-users-and-application-clients.md
@@ -49,7 +49,7 @@ The results include the access token needed to make subsequent API requests on b
 Using your app’s client id and client secret values, your app can connect to the Usergrid application endpoint to request an access token. The client ID and secret for your app can be found in 'Getting Started' section of the API Services admin portal, under 'Server App Credentials'.
 
 <div class="admonition warning"> <p class="first admonition-title">WARNING</p> <p class="last">

-Warning: You should never authenticate this way from a client-side app such as a mobile app. A hacker could analyze your app and extract the credentials for malicious use even if those credentials are compiled and in binary format. See "safe mobile access" in [Authenticating API requests](authenticating-api-requests.html) for additional considerations in keeping access to your app and its data secure.
+Warning: You should never authenticate this way from a client-side app such as a mobile app. A hacker could analyze your app and extract the credentials for malicious use even if those credentials are compiled and in binary format. See [Security Best Practices](../security-and-auth/securing-your-app.html) for additional considerations in keeping access to your app and its data secure.
 </p></div>
 
 ### Request syntax
@@ -76,7 +76,7 @@ The results include the access token needed to make subsequent API requests on b
 If you do require admin user access, your app can connect to the Usergrid management endpoint to request an access token. Your app supplies the username and password of an admin user in the request.
 
 <div class="admonition warning"> <p class="first admonition-title">WARNING</p> <p class="last">

-Warning: Authenticating as an admin user grants full access to one or more organizations and all of the applications contained in those organizations. Due to this, be cautious when implementing this type of authentication in client-side code. Instead, consider implementing admin user access in server-side code only. See "safe mobile access" in [Authenticating API requests](authenticating-api-requests.html) for additional considerations in keeping access to your app and its data secure.
+Warning: Authenticating as an admin user grants full access to one or more organizations and all of the applications contained in those organizations. Due to this, be cautious when implementing this type of authentication in client-side code. Instead, consider implementing admin user access in server-side code only. See [Security Best Practices](../security-and-auth/securing-your-app.html) for additional considerations in keeping access to your app and its data secure.
 </p></div>
 
 ### Request syntax
@@ -103,7 +103,7 @@ The results include the access token needed to make subsequent API requests on b
 If you do require organization level access, your app can connect to the Usergrid management endpoint to request an access token. Access to an organization requires the client id and client secret credentials. The client ID and secret for your organization can be found on the 'Org Administration' page of the API Services admin console under 'Organization API Credentials'.
 
 <div class="admonition warning"> <p class="first admonition-title">WARNING</p> <p class="last">

-Warning: You should never authenticate this way from a client-side app such as a mobile app. A hacker could analyze your app and extract the credentials for malicious use even if those credentials are compiled and in binary format. See "safe mobile access" in [Authenticating API requests](authenticating-api-requests.html for additional considerations in keeping access to your app and its data secure.
+Warning: You should never authenticate this way from a client-side app such as a mobile app. A hacker could analyze your app and extract the credentials for malicious use even if those credentials are compiled and in binary format. See [Security Best Practices](../security-and-auth/securing-your-app.html) for additional considerations in keeping access to your app and its data secure.
 </p></div>
 
 ### Request syntax

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/16306f42/docs/security-and-auth/facebook-sign.md
----------------------------------------------------------------------
diff --git a/docs/security-and-auth/facebook-sign.md b/docs/security-and-auth/facebook-sign.md
index e2c7411..970cb33 100644
--- a/docs/security-and-auth/facebook-sign.md
+++ b/docs/security-and-auth/facebook-sign.md
@@ -21,7 +21,7 @@ where:
 ## Facebook login example
 The Facebook technical guides for login present detailed information on how to add Facebook login to your app. Instructions are provided for JavaScript, iOS, and Android.
 
-In brief, here are the steps for JavaScript. You can see these steps implemented in the Facebook login example packaged with the JavaScript SDK for Usergrid (which you can download in ZIP format or tar.gz format). The Facebook login example is in the /examples/facebook directory of the extracted download. The code example snippets shown below are taken from the Facebook login example.
+In brief, here are the steps for JavaScript. You can see these steps implemented in the Facebook login example packaged with the JavaScript SDK for Usergrid (which you can download in ZIP format or tar.gz format). The Facebook login example is in the ``/examples/facebook`` directory of the extracted download. The code example snippets shown below are taken from the Facebook login example.
 
 ### Step 1: Create a Facebook app
 Create a new app on the Facebook App Dashboard. Enter your app's basic information. Once created, note the app ID shown at the top of the dashboard page.

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/16306f42/docs/security-and-auth/user-authentication-types.md
----------------------------------------------------------------------
diff --git a/docs/security-and-auth/user-authentication-types.md b/docs/security-and-auth/user-authentication-types.md
index 1a14f50..d02e8d3 100644
--- a/docs/security-and-auth/user-authentication-types.md
+++ b/docs/security-and-auth/user-authentication-types.md
@@ -5,7 +5,7 @@ Usergrid supports four levels of authentication, but only one of them is used wh
 ## Configuring authentication levels
 Access permissions can only be configured for the 'application user' – this can be done both programmatically and in the admin portal. The application, organization and admin clients cannot be configured, and can only be accessed programmatically via the API.
 
-For more about creating and managing roles and permissions for application users, see Managing access by defining permission rules. For a look at how security features fit together, see App Security Overview.
+For more about creating and managing roles and permissions for application users, see [Using Permissions](security-and-auth/using-permissions.html) and [Using Roles](security-and-auth/using-roles.html). For a look at how security features fit together, see [App Security Overview](../security-and-auth/app-security.html).
 
 ## User authentication level
 
@@ -16,14 +16,14 @@ For more about creating and managing roles and permissions for application users
 </tr>
 <tr>
     <td>Application user</td>
-    <td>This is the standard authentication type you will use to implement user login for your app. The application user level allows access to your Usergrid application as governed by the permission rules you create and associated with users and user groups. For more on setting permissions see Managing access by defining permission rules. Each Application User is represented by a User entity in your Usergrid application. For more about the User entity, see User.</td>
+    <td>This is the standard authentication type you will use to implement user login for your app. The application user level allows access to your Usergrid application as governed by the permission rules you create and associated with users and user groups. For more on setting permissions see [Using Permissions](security-and-auth/using-permissions.html). Each Application User is represented by a User entity in your Usergrid application. For more about the User entity, see User.</td>
 </tr>
 </table>
 
 ## Admin authentication levels
 
 <div class="admonition warning"> <p class="first admonition-title">WARNING</p> <p class="last">

-Warning: Safe use of admin authentication levels. Never use client ID and client secret, or any hard-coded credentials to authenticate this way from a client-side app, such as a mobile app. A hacker could analyze your app and extract the credentials for malicious use even if those credentials are compiled and in binary format. Even when authenticating with username and password, be cautious when using these authentication levels since they grant broad access to your Usergrid account. See "safe mobile access" in Authenticating API requests for additional considerations in keeping access to your app and its data secure.</p></div>
+Warning: Safe use of admin authentication levels. Never use client ID and client secret, or any hard-coded credentials to authenticate this way from a client-side app, such as a mobile app. A hacker could analyze your app and extract the credentials for malicious use even if those credentials are compiled and in binary format. Even when authenticating with username and password, be cautious when using these authentication levels since they grant broad access to your Usergrid account. See [Security Best Practices](../security-and-auth/securing-your-app.html) for additional considerations in keeping access to your app and its data secure.</p></div>
 
 <table class="usergrid-table">
 <tr>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/16306f42/docs/security-and-auth/using-permissions.md
----------------------------------------------------------------------
diff --git a/docs/security-and-auth/using-permissions.md b/docs/security-and-auth/using-permissions.md
index 600e09a..1454d11 100644
--- a/docs/security-and-auth/using-permissions.md
+++ b/docs/security-and-auth/using-permissions.md
@@ -33,7 +33,7 @@ Complex paths can be defined using [Apache Ant pattern syntax](http://ant.apache
 </table>
 
 ## Assigning permissions
-Permissions can only be assigned to user, group or role entities. Assigning permissions to roles can be particularly useful, as it allows you to create sets of permissions that represent complex access definitions, which can then be assigned to user and group entities. For more on roles, see Using roles.
+Permissions can only be assigned to user, group or role entities. Assigning permissions to roles can be particularly useful, as it allows you to create sets of permissions that represent complex access definitions, which can then be assigned to user and group entities. For more on roles, see [Using Roles](security-and-auth/using-roles.html).
        
 ### Request syntax
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/16306f42/docs/security-and-auth/using-roles.md
----------------------------------------------------------------------
diff --git a/docs/security-and-auth/using-roles.md b/docs/security-and-auth/using-roles.md
index 6404edb..2a794e3 100644
--- a/docs/security-and-auth/using-roles.md
+++ b/docs/security-and-auth/using-roles.md
@@ -67,7 +67,7 @@ Generally, it is easiest to a create a role for each access type you want to ena
 The following shows how to create a new role and assign permissions to it.
 
 ### Request syntax
-With cURL requests a role entity is created with a POST request, then permissions must be assigned to it with a separate request. For more on assigning permissions with cURL, see Using permissions.
+With cURL requests a role entity is created with a POST request, then permissions must be assigned to it with a separate request. For more on assigning permissions with cURL, see [Using Permissions](security-and-auth/using-permissions.html).
 
 The following details how to create a new role entity.
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/16306f42/docs/user-management/activity.md
----------------------------------------------------------------------
diff --git a/docs/user-management/activity.md b/docs/user-management/activity.md
index f477be8..4f09c8b 100644
--- a/docs/user-management/activity.md
+++ b/docs/user-management/activity.md
@@ -16,13 +16,13 @@ information about these actions).
 When a user creates an activity, it creates a relationship between the
 activity and the user who created it. Because this relationship exists,
 the activity will appear in the feed of any of the user’s followers.
-Think of the Activities endpoint (/users/{uuid|username}/activities) as
+Think of the Activities endpoint (``/users/{uuid|username}/activities``) as
 an "outbox" of news items created by the user. Think of the Feed
-endpoint (/users/{uuid|username}/feed) as an "inbox" of news items meant
+endpoint (``/users/{uuid|username}/feed``) as an "inbox" of news items meant
 to be seen or consumed by the user.
 
 A user can also post an activity to a group (located at
-/groups/{uuid|groupname}/activities). This allows you to emulate
+``/groups/{uuid|groupname}/activities``). This allows you to emulate
 Facebook-style group functionality, where a limited number of users can
 share content on a common "wall". In any of these cases, there is no
 need to construct publish/subscribe relationships manually.
@@ -36,10 +36,9 @@ to the user's activity stream for display as well as to the activity
 streams of any of the user's followers.
 
 Using Usergrid APIs you can create, retrieve, update, and delete
-activity entities. See You do not have access to view this node for
-descriptions of these APIs.
+activity entities. 
 
-**Note:** Although not shown in the API examples below, you need to
+__Note:__ Although not shown in the API examples below, you need to
 provide a valid access token with each API call. See 
 [Authenticating users and application clients](../security-and-auth/authenticating-users-and-application-clients.html) for details.
 

[23/60] [abbrv] incubator-usergrid git commit: cherry picking docs from master

[sn...@apache.org]

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/data-queries/operators-and-types.html
----------------------------------------------------------------------
diff --git a/content/docs/data-queries/operators-and-types.html b/content/docs/data-queries/operators-and-types.html
new file mode 100644
index 0000000..f021697
--- /dev/null
+++ b/content/docs/data-queries/operators-and-types.html
@@ -0,0 +1,461 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>Query operators &amp; data types &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+        <link rel="next" title="Advanced query usage" href="advanced-query-usage.html"/>
+        <link rel="prev" title="Query parameters &amp; clauses" href="query-parameters.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">Query operators &amp; data types</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#operators">Operators</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#data-types">Data types</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>Query operators &amp; data types</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/data-queries/operators-and-types.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="query-operators-data-types">
+<h1>Query operators &amp; data types<a class="headerlink" href="#query-operators-data-types" title="Permalink to this headline">¶</a></h1>
+<p>The following operators and data types are supported by the SQL-like
+query language in Usergrid.</p>
+<div class="section" id="operators">
+<h2>Operators<a class="headerlink" href="#operators" title="Permalink to this headline">¶</a></h2>
+<table class="usergrid-table">
+    <tr>
+        <td><p>Operator</p>
+</td>
+        <td><p>Purpose</p>
+</td>
+        <td><p>Example</p>
+</td>
+    </tr>
+    <tr>
+        <td><p>&#8216;&lt;&#8217; or &#8216;lt&#8217;</p>
+</td>
+        <td><p>Less than</p>
+</td>
+        <td><p>select * where quantity &gt; &#8216;1000&#8217;</p>
+</td>
+    </tr>
+    <tr>
+        <td><p>&#8216;&lt;=&#8217; or &#8216;lte&#8217;</p>
+</td>
+        <td><p>Less than or equal to</p>
+</td>
+        <td><p>Example</p>
+</td>
+    </tr>
+    <tr>
+        <td><p>&#8216;=&#8217; or &#8216;eq&#8217;</p>
+</td>
+        <td><p>Equals</p>
+</td>
+        <td><p>select * where price = &#8216;20.00&#8217;</p>
+</td>
+    </tr>
+    <tr>
+        <td><p>&#8216;&gt;=&#8217; or &#8216;gte&#8217;</p>
+</td>
+        <td><p>Greater than or equal to</p>
+</td>
+        <td><p>select * where quantity &gt;= &#8216;1000&#8217;</p>
+</td>
+    </tr>
+    <tr>
+        <td><p>&#8216;&gt;&#8217; or &#8216;gt&#8217;</p>
+</td>
+        <td><p>Greater than</p>
+</td>
+        <td><p>select * where quantity &gt; &#8216;1000&#8217;</p>
+</td>
+    </tr>
+    <tr>
+        <td><p>not</p>
+</td>
+        <td><p>Subtraction of results</p>
+</td>
+        <td><p>select * where quantity &lt; &#8216;4000&#8217; and not quantity = &#8216;2000&#8217;</p>
+</td>
+    </tr>
+    <tr>
+        <td><p>and</p>
+</td>
+        <td><p>Union of results</p>
+</td>
+        <td><p>select * where quantity &gt; &#8216;1000&#8217; and quantity &lt; &#8216;4000&#8217;</p>
+</td>
+    </tr>
+    <tr>
+        <td><p>or</p>
+</td>
+        <td><p>Intersection of results</p>
+</td>
+        <td><p>select * where quantity = &#8216;1000&#8217; or quantity = &#8216;4000&#8217;</p>
+</td>
+    </tr>
+    <tr>
+        <td><p>contains</p>
+</td>
+        <td><p>Narrow by contained text</p>
+</td>
+        <td><p>select * where title contains &#8216;tale&#8217;</p>
+</td>
+    </tr>
+</table></div>
+<div class="section" id="data-types">
+<h2>Data types<a class="headerlink" href="#data-types" title="Permalink to this headline">¶</a></h2>
+<p>As you develop queries, remember that entity properties each conform to
+a particular data type. For example, in the default entity User, the
+name property is stored as a string, the created date as a long, and
+metadata is stored as a JSON object. Your queries must be data
+type-aware to ensure that query results are as you expect them to be.</p>
+<p>For example, if you create an entity with a price property with a value
+of 100.00, querying for 100 will return no results, since the API
+expected a decimal-delimited float value in your query.</p>
+<p>For a list of property data types for each default entities, see Default
+Data Entity Types.</p>
+<table class="usergrid-table">
+    <tr>
+        <td><p>string</p>
+</td>
+        <td><pre>'value', unicode '\uFFFF', octal '\0707'</pre></td>
+    </tr>
+    <tr>
+        <td><p>long</p>
+  </td>
+          <td><pre>1357412326021</pre>
+
+Timestamps are typically stored as long values.</td>
+    </tr>
+    <tr>
+        <td><p>float</p>
+  </td>
+          <td><pre>10.1, -10.1, 10e10, 10e-10, 10E10, 10E-10</pre>
+
+Your query must be specific about the value you're looking for, down to<p>the value (if any) after the decimal point.</p>
+</td>
+    </tr>
+    <tr>
+        <td><p>boolean</p>
+</td>
+        <td><pre>true | false</pre></td>
+    </tr>
+    <tr>
+        <td><p>UUID</p>
+</td>
+        <td><pre>ee912c4b-5769-11e2-924d-02e81ac5a17b</pre></td>
+    </tr>
+    <tr>
+        <td><p>Array</p>
+</td>
+        <td><pre>["boat", "car", "bike"]</pre></td>
+    </tr>
+    <tr>
+        <td><p>object</p>
+</td>
+        <td><p><p>For a JSON object like this one:</p>
+</p>
+            <pre>
+                {
+                 "items": [
+                  {
+                   "name": "rocks"
+                  },
+                  {
+                   "name": "boats"
+                  }
+                 ]
+                }
+            </pre>
+            <p><p>you can use dot notation to reach property values in the object:</p>
+</p>
+            <pre>
+                 /mycollection/thing?ql="select * where items.name = 'rocks'"
+            </pre>
+            <p><p>Objects are often used to contain entity metadata, such as the
+activities associated with a user, the users associated with a role, and
+so on.</p>
+</p>
+            <p><p>Please note that object properties are not indexed. This means queries
+using dot-notation will be much slower than queries on indexed entity
+properties.</p>
+</p></td>
+    </tr>
+</table></div>
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+      
+        <a href="advanced-query-usage.html" class="btn btn-neutral float-right" title="Advanced query usage" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+      
+      
+        <a href="query-parameters.html" class="btn btn-neutral" title="Query parameters &amp; clauses" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+      
+    </div>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/data-queries/query-language.html
----------------------------------------------------------------------
diff --git a/content/docs/data-queries/query-language.html b/content/docs/data-queries/query-language.html
new file mode 100644
index 0000000..d8dc975
--- /dev/null
+++ b/content/docs/data-queries/query-language.html
@@ -0,0 +1,730 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>Query Language &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>Query Language</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/data-queries/query-language.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="query-language">
+<h1>Query Language<a class="headerlink" href="#query-language" title="Permalink to this headline">¶</a></h1>
+<blockquote>
+<div>Query examples in this content are shown unencoded to make them
+easier to read. Keep in mind that you might need to encode query
+strings if you&#8217;re sending them as part of URLs, such as when you&#8217;re
+executing them with the cURL tool.</div></blockquote>
+<p>The following example retrieves a list of restaurants (from a
+restaurants collection) whose name property contains the value &#8220;diner&#8221;,
+sorting the list in ascending order by name:</p>
+<div class="highlight-python"><div class="highlight"><pre>/restaurants?ql=select * where name contains &#39;diner&#39; order by name asc
+</pre></div>
+</div>
+<div class="section" id="basic-syntax">
+<h2>Basic syntax<a class="headerlink" href="#basic-syntax" title="Permalink to this headline">¶</a></h2>
+<p>Queries of Usergrid data for Apache Usergrid are made up of two kinds of
+statements: the path to the collection you want to query, followed by
+the query language statement containing your query. These two statements
+are separated by &#8221;?ql=&#8221; to indicate where the query language statement
+starts.</p>
+<p>To retrieve items from a collection, you would use a syntax such as the
+following:</p>
+<div class="highlight-python"><div class="highlight"><pre>/&lt;collection&gt;?ql=&lt;query_statement&gt;
+</pre></div>
+</div>
+<p>In the following example, the query is retrieving all users whose name
+is Gladys Kravitz.</p>
+<div class="highlight-python"><div class="highlight"><pre>/users?ql=select * where name = &#39;Gladys Kravitz&#39;
+</pre></div>
+</div>
+<p>The following example selects all items except those that have an a
+property value of 5:</p>
+<div class="highlight-python"><div class="highlight"><pre>/items?ql=select * where NOT a = 5
+</pre></div>
+</div>
+<p>Note that there is a shortcut available when your query selects all
+items matching certain criteria &#8211; in other words, where you use a
+statement that starts &#8220;select * where&#8221;. In this case, you can omit the
+first part of the statement and abbreviate it this way:</p>
+<div class="highlight-python"><div class="highlight"><pre>/items?ql=NOT a = 5
+</pre></div>
+</div>
+<p>You query your Apache Usergrid data by using a query syntax that&#8217;s like
+Structured Query Language (SQL), the query language for relational
+databases. Unlike a relational database, where you specify tables and
+columns containing the data you want to query, in your Apache Usergrid
+queries you specify collections and entities.</p>
+<p>The syntax of Apache Usergrid queries only <em>resembles</em> SQL to make
+queries familiar and easier to write. However, the language isn&#8217;t SQL.
+Only the syntax items documented here are supported.</p>
+</div>
+<div class="section" id="supported-operators">
+<h2>Supported operators<a class="headerlink" href="#supported-operators" title="Permalink to this headline">¶</a></h2>
+<p>Comparisons</p>
+<ul class="simple">
+<li>Less than <code class="docutils literal"><span class="pre">&lt;</span></code> or <code class="docutils literal"><span class="pre">lt</span></code></li>
+<li>Less than or equal <code class="docutils literal"><span class="pre">&lt;=</span></code> or <code class="docutils literal"><span class="pre">lte</span></code></li>
+<li>Equal <code class="docutils literal"><span class="pre">=</span></code> or <code class="docutils literal"><span class="pre">eq</span></code></li>
+<li>Greater than or equal <code class="docutils literal"><span class="pre">&gt;=</span></code> or <code class="docutils literal"><span class="pre">gte</span></code></li>
+<li>Greater than <code class="docutils literal"><span class="pre">&gt;</span></code> or <code class="docutils literal"><span class="pre">gt</span></code></li>
+<li>Not equal <code class="docutils literal"><span class="pre">NOT</span></code></li>
+</ul>
+<p>Logical operations</p>
+<ul class="simple">
+<li>Intersection of results <code class="docutils literal"><span class="pre">and</span></code></li>
+<li>Union of results <code class="docutils literal"><span class="pre">or</span></code></li>
+<li>Subtraction of results <code class="docutils literal"><span class="pre">not</span></code></li>
+</ul>
+</div>
+<div class="section" id="query-response-format">
+<h2>Query Response Format<a class="headerlink" href="#query-response-format" title="Permalink to this headline">¶</a></h2>
+<p>the query’s response is formatted in JavaScript Object Notation (JSON).
+This is a common format used for parameter and return values in REST web
+services.</p>
+<p>So for the following query:</p>
+<div class="highlight-python"><div class="highlight"><pre>/users?ql=select * where name = ‘Gladys Kravitz’
+</pre></div>
+</div>
+<p>...you would get a response such as the the one below. The JSON format
+arranges the data in name/value pairs. Many of the values correspond to
+specifics of the request, including the request’s HTTP action (GET), the
+application’s UUID, the request’s parameters (the query string you
+sent), and so on.</p>
+<p>Here, the query is asking for whole entities in the users collection.
+Data corresponding to the response is captured in the response’s
+<code class="docutils literal"><span class="pre">entities</span></code> array. The array has one member here, corresponding to the
+one user found by the query (another kind of query might have found more
+users). That one member gives the UUID of the entity (user), the entity
+type, and values for properties such as name, username, email, and so
+on.</p>
+<div class="code json highlight-python"><div class="highlight"><pre><span class="p">{</span>
+  <span class="s">&quot;action&quot;</span> <span class="p">:</span> <span class="s">&quot;get&quot;</span><span class="p">,</span>
+  <span class="s">&quot;application&quot;</span> <span class="p">:</span> <span class="s">&quot;8272c9b0-d86a-11e2-92e2-cdf1ce04c1c0&quot;</span><span class="p">,</span>
+  <span class="s">&quot;params&quot;</span> <span class="p">:</span> <span class="p">{</span>
+    <span class="s">&quot;ql&quot;</span> <span class="p">:</span> <span class="p">[</span> <span class="s">&quot;select * where name = &#39;Gladys Kravitz&#39;&quot;</span> <span class="p">]</span>
+  <span class="p">},</span>
+  <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span class="s">&quot;/users&quot;</span><span class="p">,</span>
+  <span class="s">&quot;uri&quot;</span> <span class="p">:</span> <span class="s">&quot;http://api.usergrid.com/myorg/myapp/users&quot;</span><span class="p">,</span>
+  <span class="s">&quot;entities&quot;</span> <span class="p">:</span> <span class="p">[</span> <span class="p">{</span>
+    <span class="s">&quot;uuid&quot;</span> <span class="p">:</span> <span class="s">&quot;d0d7d0ba-e97b-11e2-8cef-411c466c4f2c&quot;</span><span class="p">,</span>
+    <span class="s">&quot;type&quot;</span> <span class="p">:</span> <span class="s">&quot;user&quot;</span><span class="p">,</span>
+    <span class="s">&quot;name&quot;</span> <span class="p">:</span> <span class="s">&quot;Gladys Kravitz&quot;</span><span class="p">,</span>
+    <span class="s">&quot;created&quot;</span> <span class="p">:</span> <span class="mi">1373472876859</span><span class="p">,</span>
+    <span class="s">&quot;modified&quot;</span> <span class="p">:</span> <span class="mi">1373472876859</span><span class="p">,</span>
+    <span class="s">&quot;username&quot;</span> <span class="p">:</span> <span class="s">&quot;gladys&quot;</span><span class="p">,</span>
+    <span class="s">&quot;email&quot;</span> <span class="p">:</span> <span class="s">&quot;gladys@example.com&quot;</span><span class="p">,</span>
+    <span class="s">&quot;activated&quot;</span> <span class="p">:</span> <span class="n">true</span><span class="p">,</span>
+    <span class="s">&quot;picture&quot;</span> <span class="p">:</span> <span class="s">&quot;http://www.gravatar.com/avatar/20c57d4f41cf51f2db44165eb058b3b2&quot;</span><span class="p">,</span>
+    <span class="s">&quot;metadata&quot;</span> <span class="p">:</span> <span class="p">{</span>
+      <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/d0d7d0ba-e97b-11e2-8cef-411c466c4f2c&quot;</span><span class="p">,</span>
+      <span class="s">&quot;sets&quot;</span> <span class="p">:</span> <span class="p">{</span>
+        <span class="s">&quot;rolenames&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/d0d7d0ba-e97b-11e2-8cef-411c466c4f2c/rolenames&quot;</span><span class="p">,</span>
+        <span class="s">&quot;permissions&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/d0d7d0ba-e97b-11e2-8cef-411c466c4f2c/permissions&quot;</span>
+      <span class="p">},</span>
+      <span class="s">&quot;connections&quot;</span> <span class="p">:</span> <span class="p">{</span>
+        <span class="s">&quot;firstname&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/d0d7d0ba-e97b-11e2-8cef-411c466c4f2c/firstname&quot;</span><span class="p">,</span>
+        <span class="s">&quot;lastname&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/d0d7d0ba-e97b-11e2-8cef-411c466c4f2c/lastname&quot;</span>
+      <span class="p">},</span>
+      <span class="s">&quot;collections&quot;</span> <span class="p">:</span> <span class="p">{</span>
+        <span class="s">&quot;activities&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/d0d7d0ba-e97b-11e2-8cef-411c466c4f2c/activities&quot;</span><span class="p">,</span>
+        <span class="s">&quot;devices&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/d0d7d0ba-e97b-11e2-8cef-411c466c4f2c/devices&quot;</span><span class="p">,</span>
+        <span class="s">&quot;feed&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/d0d7d0ba-e97b-11e2-8cef-411c466c4f2c/feed&quot;</span><span class="p">,</span>
+        <span class="s">&quot;groups&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/d0d7d0ba-e97b-11e2-8cef-411c466c4f2c/groups&quot;</span><span class="p">,</span>
+        <span class="s">&quot;roles&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/d0d7d0ba-e97b-11e2-8cef-411c466c4f2c/roles&quot;</span><span class="p">,</span>
+        <span class="s">&quot;following&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/d0d7d0ba-e97b-11e2-8cef-411c466c4f2c/following&quot;</span><span class="p">,</span>
+        <span class="s">&quot;followers&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/d0d7d0ba-e97b-11e2-8cef-411c466c4f2c/followers&quot;</span>
+      <span class="p">}</span>
+    <span class="p">}</span>
+  <span class="p">}</span> <span class="p">],</span>
+  <span class="s">&quot;timestamp&quot;</span> <span class="p">:</span> <span class="mi">1374694196061</span><span class="p">,</span>
+  <span class="s">&quot;duration&quot;</span> <span class="p">:</span> <span class="mi">48</span><span class="p">,</span>
+  <span class="s">&quot;organization&quot;</span> <span class="p">:</span> <span class="s">&quot;myorg&quot;</span><span class="p">,</span>
+  <span class="s">&quot;applicationName&quot;</span> <span class="p">:</span> <span class="s">&quot;myapp&quot;</span><span class="p">,</span>
+  <span class="s">&quot;count&quot;</span> <span class="p">:</span> <span class="mi">1</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+<p>Compare the preceding example with the following for another kind of
+query. Imagine the following request string, where the query string is
+asking for only the values of two of the entity’s properties (username
+and name):</p>
+<div class="highlight-python"><div class="highlight"><pre>/users?ql=select username,name where name=’Gladys Kravitz’
+</pre></div>
+</div>
+<p>In the response JSON from this query, the return value is specified as
+the property of the <code class="docutils literal"><span class="pre">list</span></code> item &#8211; here, an array containing only the
+values of the properties the query asked for, in the order they were
+requested (username first, then name).</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+  <span class="s">&quot;action&quot;</span> <span class="p">:</span> <span class="s">&quot;get&quot;</span><span class="p">,</span>
+  <span class="s">&quot;application&quot;</span> <span class="p">:</span> <span class="s">&quot;8272c9b0-d86a-11e2-92e2-cdf1ce04c1c0&quot;</span><span class="p">,</span>
+  <span class="s">&quot;params&quot;</span> <span class="p">:</span> <span class="p">{</span>
+    <span class="s">&quot;ql&quot;</span> <span class="p">:</span> <span class="p">[</span> <span class="s">&quot;select username,name where name=&#39;Gladys Kravitz&#39;&quot;</span> <span class="p">]</span>
+  <span class="p">},</span>
+  <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span class="s">&quot;/users&quot;</span><span class="p">,</span>
+  <span class="s">&quot;uri&quot;</span> <span class="p">:</span> <span class="s">&quot;http://api.usergrid.com/myorg/myapp/users&quot;</span><span class="p">,</span>
+  <span class="s">&quot;list&quot;</span> <span class="p">:</span> <span class="p">[</span> <span class="p">[</span> <span class="s">&quot;gladys&quot;</span><span class="p">,</span> <span class="s">&quot;Gladys Kravitz&quot;</span> <span class="p">]</span> <span class="p">],</span>
+  <span class="s">&quot;timestamp&quot;</span> <span class="p">:</span> <span class="mi">1374697463190</span><span class="p">,</span>
+  <span class="s">&quot;duration&quot;</span> <span class="p">:</span> <span class="mi">25</span><span class="p">,</span>
+  <span class="s">&quot;organization&quot;</span> <span class="p">:</span> <span class="s">&quot;myorg&quot;</span><span class="p">,</span>
+  <span class="s">&quot;applicationName&quot;</span> <span class="p">:</span> <span class="s">&quot;myapp&quot;</span><span class="p">,</span>
+  <span class="s">&quot;count&quot;</span> <span class="p">:</span> <span class="mi">1</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="data-types-supported-in-queries">
+<h2>Data types supported in queries<a class="headerlink" href="#data-types-supported-in-queries" title="Permalink to this headline">¶</a></h2>
+<p>As you develop queries for your Apache Usergrid data, remember that
+entity properties each conform to a particular data type (whether the
+entity is included by default or an entity you defined). Your queries
+must acknowledge this, testing with values that conform to each
+property&#8217;s data type. (You can view the list of property data types for
+the default entities at <a class="reference external" href="/default-data-entities">Default Data
+Entities</a>.)</p>
+<p>For example, in the default entity <code class="docutils literal"><span class="pre">User</span></code>, the <code class="docutils literal"><span class="pre">name</span></code> property is
+stored as a <code class="docutils literal"><span class="pre">string</span></code>, the created date as a <code class="docutils literal"><span class="pre">long</span></code>, and metadata is
+stored as a JSON object. Your queries must be data type-aware so that
+you can be sure that query results are as you expect them to be.</p>
+<p>So imagine you define an entity with a <code class="docutils literal"><span class="pre">price</span></code> property whose value
+might be <code class="docutils literal"><span class="pre">100.00</span></code>. Querying for <code class="docutils literal"><span class="pre">100</span></code> will return no results even if
+there are occurrences of <code class="docutils literal"><span class="pre">100.00</span></code> as <code class="docutils literal"><span class="pre">price</span></code> values in your data
+set. That&#8217;s because the database expected a decimal-delimited <code class="docutils literal"><span class="pre">float</span></code>
+value in your query.</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="6%" />
+<col width="22%" />
+<col width="73%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Data Type</th>
+<th class="head">Examples</th>
+<th class="head">Notes</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td><code class="docutils literal"><span class="pre">string</span></code></td>
+<td><code class="docutils literal"><span class="pre">'value'</span></code>, <code class="docutils literal"><span class="pre">unicode</span> <span class="pre">'\uFFFF'</span></code>, <code class="docutils literal"><span class="pre">octal</span> <span class="pre">'\0707'</span></code></td>
+<td>true | false</td>
+</tr>
+<tr class="row-odd"><td><code class="docutils literal"><span class="pre">long</span></code></td>
+<td>1357412326021</td>
+<td>Timestamps are typically stored as <code class="docutils literal"><span class="pre">long</span></code> values.</td>
+</tr>
+<tr class="row-even"><td><code class="docutils literal"><span class="pre">float</span></code></td>
+<td>10.1, -10.1, 10e10, 10e-10, 10E10, 10e-10</td>
+<td>Your query must be specific about the value you&#8217;re looking for, down to the value (if any) after the decimal point.</td>
+</tr>
+<tr class="row-odd"><td><code class="docutils literal"><span class="pre">boolean</span></code></td>
+<td>true | false</td>
+<td>&nbsp;</td>
+</tr>
+<tr class="row-even"><td><code class="docutils literal"><span class="pre">UUID</span></code></td>
+<td>ee912c4b-5769-11e2-924d-02e81ac5a17b</td>
+<td>UUID types are typically used for the unique IDs of entities. The value must conform to the following format (do not enclose with quotation marks): xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx</td>
+</tr>
+</tbody>
+</table>
+<p><code class="docutils literal"><span class="pre">object</span></code> For a JSON object like this one:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+  <span class="s">&quot;items&quot;</span><span class="p">:[</span>
+    <span class="p">{</span><span class="s">&quot;name&quot;</span><span class="p">:</span><span class="s">&quot;rocks&quot;</span><span class="p">},</span>
+    <span class="p">{</span><span class="s">&quot;name&quot;</span><span class="p">:</span><span class="s">&quot;boats&quot;</span><span class="p">}</span>
+  <span class="p">]</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+<p>you can use dot notation to reach property values in the object:
+/mycollection/thing?ql=&#8221;select * where items.name = &#8216;rocks&#8217;&#8221; Objects
+are often used to contain entity metadata, such as the activities
+associated with a user, the users associated with a role, and so on.</p>
+</div>
+<div class="section" id="retrieving-values-for-multiple-properties">
+<h2>Retrieving values for multiple properties<a class="headerlink" href="#retrieving-values-for-multiple-properties" title="Permalink to this headline">¶</a></h2>
+<p>Your query can return multiple kinds of values &#8211; such as the values of
+multiple properties &#8211; by specifying the property names in your select
+statement as a comma-separated list.</p>
+<p>For example, the following request returns the address and phone number
+of users whose name is Gladys Kravitz:</p>
+<div class="highlight-python"><div class="highlight"><pre>/users?ql=select address,phone_number where name = &#39;Gladys Kravitz&#39;
+</pre></div>
+</div>
+</div>
+<div class="section" id="querying-for-the-contents-of-text">
+<h2>Querying for the contents of text<a class="headerlink" href="#querying-for-the-contents-of-text" title="Permalink to this headline">¶</a></h2>
+<p>Your query can search the text of entity values of the string data type.
+For example, you can search a postal code field for values that start
+with a specific three numbers.</p>
+<p>For example, the following query selects all restaurants with the word
+<code class="docutils literal"><span class="pre">diner</span></code> in the name:</p>
+<div class="highlight-python"><div class="highlight"><pre>/restaurants?ql=select * where name contains &#39;diner&#39;
+</pre></div>
+</div>
+<p><strong>Note:</strong> Not all string properties of the default entities are indexed
+for searching. This includes the <code class="docutils literal"><span class="pre">User</span></code> entity&#8217;s <code class="docutils literal"><span class="pre">username</span></code>
+property.</p>
+<p>This will return all users whose name property contains the word
+&#8216;Kravitz&#8217;</p>
+<div class="highlight-python"><div class="highlight"><pre>/users?ql=select * where name contains &#39;Kravitz&#39;
+</pre></div>
+</div>
+<p>This will return all users whose name property contains a word beginning
+with &#8216;Krav&#8217;</p>
+<div class="highlight-python"><div class="highlight"><pre>/users?ql=select * where name contains &#39;Krav*&#39;
+</pre></div>
+</div>
+<p>This will return all users whose name is exactly &#8216;Gladys Kravitz&#8217;</p>
+<div class="highlight-python"><div class="highlight"><pre>/users?ql=select * where name = &#39;Gladys Kravitz&#39;
+</pre></div>
+</div>
+</div>
+<div class="section" id="sorting-results">
+<h2>Sorting results<a class="headerlink" href="#sorting-results" title="Permalink to this headline">¶</a></h2>
+<p>You can return query results that are sorted in the order you specify.
+Use the <code class="docutils literal"><span class="pre">order</span> <span class="pre">by</span></code> clause to specify the property to sort by, along
+with the order in which results should be sorted. The syntax for the
+clause is as follows <code class="docutils literal"><span class="pre">order</span> <span class="pre">by</span> <span class="pre">&lt;property_name&gt;</span> <span class="pre">asc</span> <span class="pre">|</span> <span class="pre">desc</span></code></p>
+<p>The following table includes a few examples:</p>
+<div class="highlight-python"><div class="highlight"><pre>/users?ql=select * where lastname = &#39;Smith&#39; order by firstname asc
+
+
+/users?ql=select * where lastname = &#39;Smith&#39; order by firstname desc
+
+
+/users?ql=select * where lastname contains &#39;Sm*&#39; order by lastname asc, firstname asc
+</pre></div>
+</div>
+</div>
+<div class="section" id="geoqueries">
+<h2>Geoqueries<a class="headerlink" href="#geoqueries" title="Permalink to this headline">¶</a></h2>
+<p>Many of today&#8217;s apps are enhanced by the use of <em>geolocation</em>, wireless
+detection of the physical location of a remote device. These apps are
+said to be <em>geolocation-aware</em> in that they query the device to
+determine the user&#8217;s position and then use this data to further enhance
+the user&#8217;s experience. For example, apps can capture the exact location
+where a picture was taken or a message was created.</p>
+<p>Usergrid support geolocation on any entity, both built in (e.g., users,
+groups) and user defined.</p>
+<p>To add a location to any entity, include the following member to the
+JSON in a POST or PUT call:</p>
+<div class="highlight-python"><div class="highlight"><pre>&quot;location&quot;: {
+    &quot;latitude&quot;: 37.779632,
+    &quot;longitude&quot;: -122.395131
+}
+</pre></div>
+</div>
+<p>For example, to store a listing of restaurants and their locations,
+start by creating a collection called restaurants:</p>
+<div class="highlight-python"><div class="highlight"><pre>POST https://api.usergrid.com/org_name/app_name/restaurants
+</pre></div>
+</div>
+<p>Next, add a new entity to the collection:</p>
+<div class="highlight-python"><div class="highlight"><pre>POST https://api.usergrid.com/org_name/app_name/restaurants
+{
+  &quot;name&quot;: &quot;Rockadero&quot;,
+  &quot;address&quot;: &quot;21 Slate Street, Bedrock, CA&quot;,
+  &quot;location&quot;: {
+    &quot;latitude&quot;: 37.779632,
+    &quot;longitude&quot;: -122.395131
+  }
+}
+</pre></div>
+</div>
+<p>This creates a new restaurant entity called &#8220;Rockadero&#8221; with the
+longitude and latitude included as part of the object.</p>
+<p>When a location is added to an entity, it is easy to make queries
+against that data. For example, to see all restaurants within a 10 mile
+radius of the user&#8217;s location, make a GET call against that entity, and
+include a search query in the following format:</p>
+<div class="highlight-python"><div class="highlight"><pre>location within &lt;distance in meters&gt; of &lt;latitude&gt;, &lt;longitude&gt;
+</pre></div>
+</div>
+<p>If we use the location of our user Fred, we first need to convert miles
+to meters. 1 mile is equivalent to 1609.344 meters, so 10 miles is about
+16093 meters. Thus, the API call looks like this:</p>
+<div class="highlight-python"><div class="highlight"><pre>GET https://api.usergrid.com/org_name/app_name/restaurants?ql=location within 16093 of 37.776753, -122.407846
+</pre></div>
+</div>
+</div>
+<div class="section" id="managing-large-sets-of-results">
+<h2>Managing large sets of results<a class="headerlink" href="#managing-large-sets-of-results" title="Permalink to this headline">¶</a></h2>
+<p>When your query might return more results than you want to display to
+the user at once, you can use the limit parameter with cursors or API
+methods to manage the display of results. By default, query results are
+limited to 10 at a time. You can adjust this by setting the limit
+parameter to a value you prefer.</p>
+<p>For example, you might execute a query that could potentially return
+hundreds of results, but you want to display 20 of those at a time to
+users. To do this, your code sets the limit parameter to 20 when
+querying for data, then provides a way for the user to request more of
+the results when they&#8217;re ready.</p>
+<p>You would use the following parameters in your query:</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="33%" />
+<col width="33%" />
+<col width="33%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Type</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td><code class="docutils literal"><span class="pre">limit</span></code></td>
+<td>integer</td>
+<td><p class="first">Number of results to
+return. The maximum
+number of results is
+1,000. Specifying a
+limit greater than
+1,000 will result in a
+limit of 1,000.</p>
+<p>Limit is applied to the
+collection, not the
+query string. For
+example, the following
+query will find the
+first 100 entities in
+the books collection,
+then from that set
+return the ones with
+author=&#8217;Hemingway&#8217;:</p>
+<div class="highlight-python"><div class="highlight"><pre>/books?ql=author =
+</pre></div>
+</div>
+<p>&#8216;Hemingway&#8217;&amp;limit=100</p>
+<p>You can also use the
+limit parameter on a
+request without a query
+string. The following
+example is shorthand
+for selecting all books
+and limiting by 100 at
+a time:</p>
+<div class="highlight-python"><div class="highlight"><pre>/books?limit=100
+</pre></div>
+</div>
+<p>Using a limit on a
+DELETE can help you
+manage the amount of
+time it takes to delete
+data. For example you
+can delete all of the
+books, 1000 at a time,
+with the following:</p>
+<div class="highlight-python"><div class="highlight"><pre>DELETE /books?limit
+</pre></div>
+</div>
+<p>=1000</p>
+<p class="last">Keep in mind that
+DELETE operations can
+take longer to execute.
+Yet even though the
+DELETE query call might
+time out (such as with
+a very large limit),
+the operation will
+continue on the server
+even if the client
+stops waiting for the
+result.</p>
+</td>
+</tr>
+<tr class="row-odd"><td><code class="docutils literal"><span class="pre">cursor</span></code></td>
+<td>string</td>
+<td>An encoded
+representation of the
+query position pointing
+to a set of results. To
+retrieve the next set
+of results, pass the
+cursor with your next
+call for most results.</td>
+</tr>
+</tbody>
+</table>
+<p>For example:</p>
+<p>Select all users whose name starts with fred, and returns the first 50
+results:</p>
+<div class="highlight-python"><div class="highlight"><pre>/users?ql=select * where name = &#39;fred*&#39;&amp;limit=50
+</pre></div>
+</div>
+<p>Retrieve the next batch of users whose name is &#8220;fred&#8221;, passing the
+cursor received from the last request to specify where the next set of
+results should begin:</p>
+<div class="highlight-python"><div class="highlight"><pre>/users?ql=select * where name = &#39;fred*&#39;&amp;limit=50&amp;cursor=LTIxNDg0NDUxNDpnR2tBQVFFQWdITUFDWFJ2YlM1emJXbDBhQUNBZFFBUUQyMVZneExfRWVLRlV3TG9Hc1doZXdDQWRRQVFIYVdjb0JwREVlS1VCd0xvR3NWT0JRQQ
+</pre></div>
+</div>
+</div>
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/data-queries/query-parameters.html
----------------------------------------------------------------------
diff --git a/content/docs/data-queries/query-parameters.html b/content/docs/data-queries/query-parameters.html
new file mode 100644
index 0000000..bb5c638
--- /dev/null
+++ b/content/docs/data-queries/query-parameters.html
@@ -0,0 +1,511 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>Query parameters &amp; clauses &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+        <link rel="next" title="Query operators &amp; data types" href="operators-and-types.html"/>
+        <link rel="prev" title="Querying your data" href="querying-your-data.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">Query parameters &amp; clauses</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#contains">Contains</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#location">Location</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#order-by">Order by</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#limit">Limit</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#cursor">Cursor</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>Query parameters &amp; clauses</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/data-queries/query-parameters.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="query-parameters-clauses">
+<h1>Query parameters &amp; clauses<a class="headerlink" href="#query-parameters-clauses" title="Permalink to this headline">¶</a></h1>
+<p>When querying your data, you can use your query string to get the data,
+then sort and manage it on the client. This topic describes a few
+techniques.</p>
+<p>Query examples in this content are shown unencoded to make them easier
+to read. Keep in mind that you might need to encode query strings if
+you&#8217;re sending them as part of URLs, such as when you&#8217;re executing them
+with the cURL tool.</p>
+<div class="admonition note"> <p class="first admonition-title"><p>Note</p>
+  </p> <p class="last">
+
+
+Optimizing queries. As a best practice, you should include no more<p>than 3 parameters in your queries. The API will not prevent you from
+submitting a query with more than 3 parameters; however, due to the
+nature of NoSQL, queries with many parameters can quickly become very
+inefficient.</p>
+</p></div><p>For more information, see our <a class="reference external" href="../data-store/data-storage-dbms.html">Usergrid DBMS
+overview</a> and <a class="reference external" href="../data-storage/optimizing-access">Data store best
+practices</a>.</p>
+<div class="section" id="contains">
+<h2>Contains<a class="headerlink" href="#contains" title="Permalink to this headline">¶</a></h2>
+<p>Your query can search the text of entity values of the string data type.
+For example, you can search a postal code field for values that start
+with a specific three numbers.</p>
+<p>For example, the following query selects all restaurants with the word
+diner in the name:</p>
+<div class="highlight-python"><div class="highlight"><pre>/restaurants?ql=select * where restaurants contains &#39;diner&#39;
+</pre></div>
+</div>
+<p><strong>Note</strong>: Not all string properties of the default entities are indexed
+for searching. This includes the User entity&#8217;s username property.</p>
+<p>The following table lists a few examples of the kind of searches you can
+do in queries.</p>
+<table class="usergrid-table">
+    <tr>
+        <td><p>Goal</p>
+</td>
+        <td><p>Example</p>
+</td>
+        <td><p>Notes</p>
+</td>
+    </tr>
+    <tr>
+        <td><p>Find books whose &#8216;title&#8217; property contains the full word &#8220;tale&#8221;.</p>
+</td>
+        <td><pre>/books?ql=select * where title contains 'tale'</pre></td>
+        <td><p>containslooks for the occurrence of a full word anywhere in the searched
+property. Note that contains will not work on the &#8216;name&#8217; property, since
+it is not full-text indexed in the database.</p>
+</td>
+    </tr>
+    <tr>
+        <td><p>Find books whose &#8216;title&#8217; property contains a word that starts with &#8220;ta&#8221;.</p>
+</td>
+        <td><pre>/books?ql=select * where title contains 'ta*'</pre></td>
+        <td><p>containswill look for partial words if you include a wildcard.</p>
+</td>
+    </tr>
+    <tr>
+        <td><p>Find books whose title property is exactly and only &#8220;A Tale of Two
+Cities&#8221;.</p>
+</td>
+        <td><pre>/books?ql=select * where title = 'A Tale of Two Cities'</pre></td>
+        <td><p>The = operator is looking for a match in the entire searched property
+value. Use a * wildcard to look for some set of the first characters
+only.</p>
+</td>
+    </tr>
+</table></div>
+<div class="section" id="location">
+<h2>Location<a class="headerlink" href="#location" title="Permalink to this headline">¶</a></h2>
+<p>If you&#8217;ve stored location data with your entities, you can query for the
+proximity of the geographical locations those entities represent. For
+more information on geolocation, see Geolocation.</p>
+<table class="usergrid-table">
+    <tr>
+        <td><p>Goal</p>
+</td>
+        <td><p>Example</p>
+</td>
+        <td><p>Notes</p>
+</td>
+    </tr>
+    <tr>
+        <td><p>Find stores whose locations are within the specified longitude and
+latitude.</p>
+</td>
+        <td><pre>/stores?ql=location within 500 of 40.042016, -86.900749</pre></td>
+        <td><p>within will test for values within the value you specify. The within
+value is expressed as a number of meters.The return results are sorted
+in order of nearest to furthest. If there are multiple entries at the
+same location, they&#8217;re returned in the order they were added to the
+database. For more on geolocation queries, see Geolocation.</p>
+</td>
+    </tr>
+</table></div>
+<div class="section" id="order-by">
+<h2>Order by<a class="headerlink" href="#order-by" title="Permalink to this headline">¶</a></h2>
+<p>You can return query results that are sorted in the order you specify.
+Use the order by clause to specify the property to sort by, along with
+the order in which results should be sorted. The syntax for the clause
+is as follows:</p>
+<div class="highlight-python"><div class="highlight"><pre>order by &lt;property_name&gt; asc | desc
+</pre></div>
+</div>
+<p>The following table includes a few examples:</p>
+<table class="usergrid-table">
+    <tr>
+        <td><p>Goal</p>
+</td>
+        <td><p>Example</p>
+</td>
+    </tr>
+    <tr>
+        <td><p>Sort by first name in ascending order</p>
+</td>
+        <td><p>/users?ql=select * where lastname = &#8216;Smith&#8217; order by firstname asc</p>
+</td>
+    </tr>
+    <tr>
+        <td><p>Sort by first name in descending order</p>
+</td>
+        <td><p>/users?ql=select * where lastname = &#8216;Smith&#8217; order by firstname desc</p>
+</td>
+    </tr>
+    <tr>
+        <td><p>Sort by last name, then first name in ascending orderl</p>
+</td>
+        <td><p>/users?ql=select * where lastname contains &#8216;Sm*&#8217; order by lastname
+asc, firstname asc</p>
+</td>
+    </tr>
+<table></div>
+<div class="section" id="limit">
+<h2>Limit<a class="headerlink" href="#limit" title="Permalink to this headline">¶</a></h2>
+<p>When your query might return more results than you want to display to
+the user at once, you can use the limit parameter with cursors or API
+methods to manage the display of results. By default, query results are
+limited to 10 at a time. You can adjust this by setting the limit
+parameter to a value you prefer.</p>
+<p>For example, you might execute a query that could potentially return
+hundreds of results, but you want to display 20 of those at a time to
+users. To do this, your code sets the limit parameter to 20 when
+querying for data, then provides a way for the user to request more of
+the results when they&#8217;re ready.</p>
+<p>You would use the following parameters in your query:</p>
+<table class="usergrid-table">
+    <tr>
+        <td><p>Parameter</p>
+</td>
+        <td><p>Type</p>
+</td>
+        <td><p>Description</p>
+</td>
+    </tr>
+    <tr>
+        <td><p>limit</p>
+</td>
+        <td><p>integer</p>
+</td>
+        <td><p><p>Number of results to return. The maximum number of results is 1,000.
+Specifying a limit greater than 1,000 will result in a limit of 1,000.</p>
+</p>
+            <p><p>You can also use the limit parameter on a request without a query
+string. The following example is shorthand for selecting all books and
+limiting by 100 at a time:</p>
+</p>
+            <pre>/books?limit=100</pre>
+            <p><p>Using a limit on a DELETE can help you manage the amount of time it
+takes to delete data. For example you can delete all of the books, 1000
+at a time, with the following:</p>
+</p>
+            <pre>DELETE /books?limit=1000</pre>
+            <p><p>Keep in mind that DELETE operations can take longer to execute. Yet even
+though the DELETE query call might time out (such as with a very large
+limit), the operation will continue on the server even if the client
+stops waiting for the result.</p>
+</p>
+        </td>
+    </tr>
+</table><p>For example:</p>
+<p>Select all users whose name starts with fred, and returns the first 50
+results:</p>
+<div class="highlight-python"><div class="highlight"><pre>/users?ql=select * where name = &#39;fred*&#39;&amp;limit=50
+</pre></div>
+</div>
+</div>
+<div class="section" id="cursor">
+<h2>Cursor<a class="headerlink" href="#cursor" title="Permalink to this headline">¶</a></h2>
+<table class="usergrid-table">
+    <tr>
+        <td><p>Parameter</p>
+</td>
+        <td><p>Type</p>
+</td>
+        <td><p>Description</p>
+</td>
+    </tr>
+    <tr>
+        <td><p>cursor</p>
+</td>
+        <td><p>string</p>
+</td>
+        <td><p>An encoded representation of the query position pointing to a set of
+results. To retrieve the next set of results, pass the cursor with your
+next call for most results./td&gt;</p>
+</tr>
+</table><p>Retrieve the next batch of users whose name is &#8220;fred&#8221;, passing the
+cursor received from the last request to specify where the next set of
+results should begin:</p>
+<div class="highlight-python"><div class="highlight"><pre>/users?ql=select * where name = &#39;fred*&#39;&amp;limit=50&amp;cursor=LTIxNDg0NDUxNDpVdjb0JwREVlS1VCd0xvR3NWT0JRQQ
+</pre></div>
+</div>
+</div>
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+      
+        <a href="operators-and-types.html" class="btn btn-neutral float-right" title="Query operators &amp; data types" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+      
+      
+        <a href="querying-your-data.html" class="btn btn-neutral" title="Querying your data" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+      
+    </div>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

[02/60] [abbrv] incubator-usergrid git commit: cherry picking docs from master

[sn...@apache.org]

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/website/content/community/index.html
----------------------------------------------------------------------
diff --git a/website/content/community/index.html b/website/content/community/index.html
new file mode 100644
index 0000000..467c9a3
--- /dev/null
+++ b/website/content/community/index.html
@@ -0,0 +1,240 @@
+
+<div id="map-canvas" style="width: 100%;"></div>
+
+<section class="bf-tagline">
+    <div class="container">
+    	<div class="row">
+    	    <div class="col-md-12">
+    	    	<h2>The Apache Usergrid community has members in 170+ cities in 30 countries on 6 continents</h2>
+			</div>
+		</div>
+	</div>
+</section>
+
+
+<section class="bf-community">
+    <div class="container">
+    	<div class="row">
+    	    <div class="col-md-12" id="events">
+    	    	<h2 class="icns-calendar"><span>Events</span></h2>
+			</div>
+		</div>
+		<div class="row">
+    	<div class="col-md-3 done">
+    	    	<h3><a href=http://events.linuxfoundation.org/events/apachecon-north-america/">ApacheCon Denver</a><small>April 7-9</small></h3>
+    	    	<p>Featuring our very own Dave Johnson who will deliver a talk on <a href="http://www.slideshare.net/snoopdave/how-to-contribute-to-apache-usergrid">"How to contribute to Apache Usergrid"</a><p>
+			</div>
+      <div class="col-md-3 done">
+        <h3>Seoul Hack Day #1 <small>January 24</small></h3>
+        <p>KT is hosting a Usergrid evening in Gangnam, Seoul, South Korea! <a href="http://onoffmix.com/event/22000">Register on OnOffMix.com</a><p>
+      </div>
+			<div class="col-md-3 done">
+    	    	<h3>SF Bay Area Meetup #1 <small>January 23</small></h3>
+    	    	<p>Can’t join us for the afternoon hack day? We’ll host an evening meetup right afterwards! Or join us for both! <a href="http://www.meetup.com/apache-usergrid-bay-area/events/155130862/">Register on Meetup.com</a><p>
+			</div>
+			<div class="col-md-3">
+				<h3>&nbsp;</h3>
+    	    	<p><i>Want to organize a Usergrid event? <a href="mailto:snoopdave@apache.org">Contact us!</a></i><p>
+			</div>
+		</div>
+	</div>
+</section>
+
+<section class="bf-community">
+    <div class="container">
+    	<div class="row">
+    	    <div class="col-md-12" id="live">
+    	    	<h2 class="icns-chat"><span>Live Chat</span></h2>
+			</div>
+		</div>
+		<div class="row">
+    	<div class="col-md-3 done">
+    	    	<h3><a href="https://www.hipchat.com/gDDIQrdQa">HipChat</a></h3>
+    	    	<p>Some of the Usergrid team hangs around in this HipChat Room: <a href="https://www.hipchat.com/gDDIQrdQa" target="_blank">https://www.hipchat.com/gDDIQrdQa</a>. Come by and chat for a spell!<p>
+		</div>
+      	<div class="col-md-3 done">
+        	<h3>IRC</h3>
+        	<p>Another (less used) option is the Usergrid IRC chat channel <a href="http://webchat.freenode.net/?channels=%23usergrid&uio=d4" target="_blank">#usergrid</a>.<p>
+      </div>
+	</div>
+</section>
+
+<section class="bf-community">
+    <div class="container">
+    	<div class="row">
+    	    <div class="col-md-12">
+    	    	<h2 class="icns-envelope" id="mailing-lists"><span>Mailing-lists</span></h2>
+			</div>
+		</div>
+		<div class="row">
+	    	<div class="col-md-4">
+	    		<h3>Users</h3>
+	    		<p><em>Perfect if you build apps against Apache Usergrid or deploy Apache Usergrid.</em></p>
+	    		<p>To subscribe, send a blank email to<br/><a href="mailto:user-subscribe@usergrid.incubator.apache.org">user-subscribe@usergrid.incubator.apache.org</a>.</p>
+	    		<p>You can also <a href="https://mail-archives.apache.org/mod_mbox/incubator-usergrid-user/">read the archives</a>.</p>
+			</div>
+	    	<div class="col-md-4">
+	    		<h3>Dev</h3>
+	    		<p><em>If you are building contributions & modifications to Apache Usergrid’s stack, portal, cli and SDKs, this is the list for you.</em><p>
+	    		<p>To subscribe, send a blank email to<br/><a href="mailto:dev-subscribe@usergrid.incubator.apache.org">dev-subscribe@usergrid.incubator.apache.org</a>.</p>
+	    		<p>You can also <a href="https://mail-archives.apache.org/mod_mbox/incubator-usergrid-dev/">read the archives</a>.</p>
+			</div>
+	    	<div class="col-md-4">
+	    		<h3>Commits</h3>
+	    		<p><em>This list receives an email whenever new code is contributed to Apache Usergrid.</em><p>
+	    		<p>To subscribe, send a blank email to<br/><a href="mailto:commits-subscribe@usergrid.incubator.apache.org">commits-subscribe@usergrid.incubator.apache.org</a>.</p>
+	    		<p>You can also <a href="https://mail-archives.apache.org/mod_mbox/incubator-usergrid-commits/">read the archives</a>.</p>
+			</div>
+		</div>
+	</div>
+</section>
+
+<section class="bf-community">
+    <div class="container">
+    	<div class="row">
+    	    <div class="col-md-12">
+    	    	<h2 class="icns-briefcase" id="deployments"><span>Deployments</span></h2>
+			</div>
+		</div>
+		<div class="row">
+			<a href="http://baas.io">
+	    	    <div class="col-md-3">
+	    	    	<h3>baas.io (Korea Telecom)</h3>
+	    	    	<p>Korea Telecom uses Apache Usergrid as the core of its public mobile application development platform baas.io, in operation since 2012.<p>
+				</div>
+			</a>
+			<a href="http://globo.com">
+				<div class="col-md-3">
+	    	    	<h3>Globo.com</h3>
+	    	    	<p>Brazilian media conglomerate Globo uses Apache Usergrid as part of its internal publishing platform for globo.com<p>
+				</div>
+			</a>
+			<a href="http://developers.apigee.com">
+				<div class="col-md-3">
+					<h3>Apigee</h3>
+	    	    	<p>Californian startup Apigee uses Apache Usergrid as a component of its cloud developer platform<p>
+				</div>
+			</a>
+			<a href="http://easemob.com">
+			<h3>Easemob</h3>
+    	    	<p>Easemob uses Apache Usergrid as part of its <a href="http://easemob.com">IM Cloud development platform</a>, which provides cloud service for app developers to integrate IM service in munites.<p> 
+			</div>
+			</a>
+			<div class="col-md-3">
+				<h3>&nbsp;</h3>
+    	    	<p><i>Want to be added to this list? <a href="mailto:snoopdave@apache.org">Contact us!</a></i><p>
+			</div>
+		</div>
+	</div>
+</section>
+
+<section class="bf-community committers">
+    <div class="container">
+    	<div class="row">
+    	    <div class="col-md-12">
+    	    	<h2 class="icns-group" id="committers"><span>Committers</span></h2>
+			</div>
+		</div>
+		<div class="row">
+			<div class="col-md-2 text-center">
+				<img src="/img/alberto.jpg" />
+				<p>Alberto Leal</p>
+			</div>
+			<div class="col-md-2 text-center">
+				<img src="/img/alex.png" />
+				<p>Alex Karasulu</p>
+			</div>
+			<div class="col-md-2 text-center">
+				<img src="/img/github.png" />
+				<p>Askhat Asanaliev</p>
+			</div>
+			<div class="col-md-2 text-center">
+				<img src="/img/dave.jpg" />
+				<p>Dave Johnson</p>
+			</div>
+			<div class="col-md-2 text-center">
+				<img src="/img/ed.jpg" />
+				<p>Ed Anuff</p>
+			</div>
+			<div class="col-md-2 text-center">
+				<img src="/img/github.png" />
+				<p>Furkan Bicak</p>
+			</div>
+		</div>
+		<div class="row">
+			<div class="col-md-2 text-center">
+				<img src="/img/grey.png" />
+				<p>George Reyes</p>
+			</div>
+			<div class="col-md-2 text-center">
+				<img src="/img/nate.jpg" />
+				<p>Nate McCall</p>
+			</div>
+			<div class="col-md-2 text-center">
+				<img src="/img/rod.jpg" />
+				<p>Rod Simpson</p>
+			</div>
+			<div class="col-md-2 text-center">
+				<img src="/img/scott.jpg" />
+				<p>Scott Ganyo</p>
+			</div>
+			<div class="col-md-2 text-center">
+				<img src="/img/stliu.jpg" />
+				<p>Shaozhuang Liu</p>
+			</div>
+            <div class="col-md-2 text-center">
+				<img src="/img/shawn.jpg" />
+				<p>Shawn Feldman</p>
+			</div>
+		</div>
+		<div class="row">
+			<div class="col-md-2 text-center">
+				<img src="/img/sungju.jpg" />
+				<p>Sungju Jin</p>
+			</div>
+			<div class="col-md-2 text-center">
+				<img src="/img/tim.jpg" />
+				<p>Tim Anglade</p>
+			</div>
+			<div class="col-md-2 text-center">
+				<img src="/img/todd.jpg" />
+				<p>Todd Nine</p>
+			</div>
+			<div class="col-md-2 text-center">
+				<img src="/img/github.png" />
+				<p>Yigit Sapli</p>
+			</div>
+			<div class="col-md-2 text-center">
+				<img src="/img/jeff.jpg" />
+				<p>Jeff West</p>
+			</div>
+			<div class="col-md-2 text-center">
+			</div>
+		</div>
+	</div>
+</section>
+
+<section class="bf-community tools">
+    <div class="container">
+    	<div class="row">
+    	    <div class="col-md-12">
+    	    	<h2 class="icns-tools" id="tools"><span>Tools</span></h2>
+			</div>
+		</div>
+		<div class="row">
+			<div class="col-md-2 text-center">
+				<a href="http://www.jetbrains.com/idea/" target="_blank"><img src="/img/intellij.png" /></a>
+				<p>IntelliJ IDEA</p>
+			</div>
+			<div class="col-md-2 text-center">
+				<a href="http://yourkit.com/" target="_blank"><img src="/img/yourkit.jpeg" /></a>
+				<p>YourKit Java Profiler</p>
+			</div>
+			<div class="col-md-2 text-center">
+				<a href="http://structure101.com/" target="_blank"><img src="/img/structure101.png" /></a>
+				<p>structure101</p>
+			</div>
+		</div>
+		These great companies have provided free product licenses to the Apache Usergrid team. We use these tools and love them.  Thank you!
+	</div>
+</section>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/website/layouts/default.html
----------------------------------------------------------------------
diff --git a/website/layouts/default.html b/website/layouts/default.html
new file mode 100644
index 0000000..72a9f1e
--- /dev/null
+++ b/website/layouts/default.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<%= render 'header', {:docs => @docs, :community => @community} %>
+
+<% if @docs %>
+<div class="container bf-docs-container">    
+    <div class="row">
+
+        <div class="col-md-9 main-article" role="main">
+            <div class="page-article">
+                <div class="page-header">
+                    <h1><%= @item[:title] %></h1>
+                    <!-- TODO: reenable this when we sync SVN to GitHub
+                  <small><a target="_blank" href="https://github.com/usergrid/website/blob/master/content<%= @item.path[0..-2] %>.md">contribute to this article on github</a></small>
+                    -->
+                </div>
+                <%= @content %>
+            </div>
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-md-3"></div>
+        <div class="col-md-9">
+            <div class="github-callout">
+                <strong>Questions?</strong> Please do <a href="/community">ask on the mailing-lists</a>!<br/>
+                <!--
+                <strong>Found an error?</strong> We’d greatly appreciate a pull request about <a target="_blank" href="https://github.com/usergrid/website/blob/master/content<%= @item.path[0..-2] %>.md">this article on github</a>.</div> 
+                -->
+            </div>
+        </div>
+    </div>
+</div>
+<% else %>
+
+<%= @content %>
+
+<% end %>
+
+<%= render 'footer' %>
+
+
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/website/layouts/footer.html
----------------------------------------------------------------------
diff --git a/website/layouts/footer.html b/website/layouts/footer.html
new file mode 100644
index 0000000..143ba53
--- /dev/null
+++ b/website/layouts/footer.html
@@ -0,0 +1,94 @@
+<footer class="bf-footer" role="contentinfo">
+    <div class="container">
+        <div class="row">
+            <div class="col-md-2">
+                <ul class="nav nav-list">
+                    <li class="nav-header"><a href="/">Home</a></li>
+                    <li class="nav-header"><a href="/community/">Community</a></li>
+                        <li><a href="/community/#events">Events</a></li>
+                        <li><a href="/community/#mailing-lists">Mailing Lists</a></li>
+                        <li><a href="/community/#deployments">Deployments</a></li>
+                        <li><a href="/community/#committers">Commiters</a></li>
+                </ul>
+            </div>
+            <div class="col-md-2">
+                <ul class="nav nav-list">
+                    <li class="nav-header"><a href="https://github.com/apache/incubator-usergrid/" target="_blank">Code</a></li>
+                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/stack" target="_blank">Server Stack</a></li>
+                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/portal" target="_blank">Admin Portal</a></li>
+                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/ugc" target="_blank">ugc command line</a></li>
+                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/ios" target="_blank">iOS SDK</a></li>
+                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/android" target="_blank">Android SDK</a></li>
+                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/html5-javascript" target="_blank">HTML5/JS SDK</a></li>
+                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/nodejs" target="_blank">node.js module</a></li>
+                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/ruby-on-rails" target="_blank">Ruby on Rails gem</a></li>
+                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/ruby" target="_blank">Ruby gem</a></li>
+                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/php" target="_blank">PHP SDK</a></li>
+                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/java" target="_blank">Java SDK</a></li>
+                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/dotnet" target="_blank">.NET / Windows SDK</a></li>
+                </ul>
+            </div>
+            <div class="col-md-2">
+                <ul class="nav nav-list">
+                    <li class="nav-header">Resources</li>
+                    <li><a href="http://github.com/apache/incubator-usergrid" target="_blank">GitHub Code</a></li>
+                    <li><a href="docs" target="_blank">Docs</a></li>
+                    <li><a href="https://issues.apache.org/jira/secure/RapidBoard.jspa?rapidView=23&view=planning&selectedIssue=USERGRID-362&epics=visible" target="_blank">JIRA Bug Tracker</a></li>
+                    <li><a href="http://stackoverflow.com/search?q=usergrid" target="_blank">StackOverflow</a></li>
+                    <li><a href="/community/#live">Live Chat</a></li>
+                    <li><a href="https://twitter.com/usergrid" target="_blank">Twitter</a></li>
+                    <li><a href="http://incubator.apache.org/projects/usergrid.html" target="_blank">Podling Listing</a></li>
+                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/stack#requirements" target="_blank">Getting Started</a></li>
+                    <li><a href="https://cwiki.apache.org/confluence/display/usergrid/GitHub+Based+Contribution+Workflow" target="_blank">Contribution Guidelines</a></li>
+                </ul>
+            </div>
+            <div class="col-md-2">
+                <ul class="nav nav-list">
+                    <li class="nav-header">Apache</li>
+                    <li><a href="http://www.apache.org/licenses/" target="_blank">License</a></li>
+                    <li><a href="http://www.apache.org/foundation/sponsorship.html" target="_blank">Sponsorship</a></li>
+                    <li><a href="http://www.apache.org/foundation/thanks.html" target="_blank">Thanks</a></li>
+                    <li><a href="http://www.apache.org/security/">Security</a></li>
+                    <li><a href="http://www.apache.org/" target="_blank">Apache Foundation</a></li>
+                </ul>
+            </div>
+            <div class="col-md-4">
+                <a class="twitter-timeline" href="https://twitter.com/search?q=%23usergrid" data-widget-id="401499136807038976"  data-related="usergrid" height="400px" style="overflow:hidden">Tweets about "usergrid"</a>
+                <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
+            </div> 
+        <!--
+            <div class="col-md-4">
+                <div class="input-group form-search">
+                    <input type="text" class="form-control search-query">
+                    <span class="input-group-btn">
+                        <button type="submit" class="btn btn-primary" data-type="last">Search</button>
+                    </span>
+                </div>
+            </div> -->
+        </div> 
+        <div class="row">
+            <div id="copyright">
+                <img src="/img/egg-logo.png" /><br/><br/>
+                <p>Apache Usergrid is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.</p>
+                <p>Copyright © 2013 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.<br>
+                Apache and the Apache feather logos are trademarks of The Apache Software Foundation.</p>
+                <p class="credits">Site designed & assembled with love by <a href="https://github.com/ryuneeee">@ryuneeee</a> + <a href="https://github.com/realbeast">@realbeast</a> + <a href="https://twitter.com/timanglade">@timanglade</a> + <a href="https://twitter.com/snoopdave">@snoopdave</a> .</p>
+            </div>
+        </div>
+    </div>
+</footer>
+
+<script type="text/javascript" src="/js/head.js"></script>
+<script type="text/javascript">
+    head.js("/js/jquery-1.10.1.min.js", "/js/bootstrap.min.js", "/js/usergrid-site.js");
+</script>
+<script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+  ga('create', 'UA-45815079-1', 'apache.org');
+  ga('send', 'pageview');
+
+</script>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/website/layouts/header.html
----------------------------------------------------------------------
diff --git a/website/layouts/header.html b/website/layouts/header.html
new file mode 100644
index 0000000..0415ce2
--- /dev/null
+++ b/website/layouts/header.html
@@ -0,0 +1,229 @@
+<head>
+    <meta charset="utf-8">
+    <title>Apache Usergrid (incubating) — <%= @item[:title] %></title>
+    <meta http-equiv="x-ua-compatible" content="ie=edge" />
+    <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1" />
+    <meta name="keywords" content="Apache Usergrid, Usergrid, BaaS, Backend-as-a-Service">
+    <meta name="description" content="An open-source Backend-as-a-Service stack for web & mobile applications, based on RESTful APIs." />
+    <meta property="og:title" content="Apache Usergrid" />
+    <meta property="og:description" content="An open-source Backend-as-a-Service stack for web & mobile applications, based on RESTful APIs." />
+    <!-- Loading Typekit -->
+    <script type="text/javascript" src="//use.typekit.net/ddl7izx.js"></script>
+    <script type="text/javascript">try{Typekit.load();}catch(e){}</script>
+    <!-- Loading Bootstrap -->
+    <link href="/bootstrap/bootstrap.min.css" rel="stylesheet" type='text/css'>
+    <link href="/css/bootflat.css" rel="stylesheet" type='text/css'>
+    <link href="/css/usergrid-site.css" rel="stylesheet" type='text/css'>
+    <link href="https://fonts.googleapis.com/css?family=Open+Sans:200,400,500,300,600,800,700,400italic,600italic,700italic,800italic,300italic" rel="stylesheet" type="text/css">
+    <link href="/css/font-awesome.min.css" rel="stylesheet" type='text/css'>
+
+    <% if @community == true %>
+    <script type="text/javascript"
+      src="https://maps.googleapis.com/maps/api/js?key=AIzaSyBYSxyIKS22zC4wSLFXZGR8QKXbGWLFwYw&sensor=false">
+    </script>
+    <script type="text/javascript">
+
+        var points = [
+                new google.maps.LatLng(-33.8674869,151.2069902),
+                new google.maps.LatLng(40.2338438,-111.6585337),
+                new google.maps.LatLng(37.6909682,-122.3107517),
+                new google.maps.LatLng(-37.6825027,176.1880232),
+                new google.maps.LatLng(-0.023559,37.906193),
+                new google.maps.LatLng(41.00527,28.97696),
+                new google.maps.LatLng(47.1569444,27.5902778),
+                new google.maps.LatLng(49.261226,-123.1139268),
+                new google.maps.LatLng(55.378051,-3.435973),
+                new google.maps.LatLng(30.3321838,-81.65565099999999),
+                new google.maps.LatLng(30.267153,-97.7430608),
+                new google.maps.LatLng(-14.235004,-51.92528),
+                new google.maps.LatLng(41.76371109999999,-72.6850932),
+                new google.maps.LatLng(53.3498053,-6.2603097),
+                new google.maps.LatLng(-37.814107,144.96328),
+                new google.maps.LatLng(26.820553,30.802498),
+                new google.maps.LatLng(34.0522342,-118.2436849),
+                new google.maps.LatLng(37.566535,126.9779692),
+                new google.maps.LatLng(7.873053999999999,80.77179699999999),
+                new google.maps.LatLng(39.737567,-104.9847179),
+                new google.maps.LatLng(52.9399159,-73.5491361),
+                new google.maps.LatLng(40.7143528,-74.00597309999999),
+                new google.maps.LatLng(44.9374831,-93.20099979999999),
+                new google.maps.LatLng(38.963745,35.243322),
+                new google.maps.LatLng(35.7795897,-78.6381787),
+                new google.maps.LatLng(35.907757,127.766922),
+                new google.maps.LatLng(-6.2689913,106.8060388),
+                new google.maps.LatLng(27.3364347,-82.53065269999999),
+                new google.maps.LatLng(44.494887,11.3426163),
+                new google.maps.LatLng(39.952335,-75.16378900000001),
+                new google.maps.LatLng(37.09024,-95.712891),
+                new google.maps.LatLng(40.5852602,-105.084423),
+                new google.maps.LatLng(43.653226,-79.3831843),
+                new google.maps.LatLng(47.6062095,-122.3320708),
+                new google.maps.LatLng(31.046051,34.851612),
+                new google.maps.LatLng(51.41233,-0.300689),
+                new google.maps.LatLng(39.4699075,-0.3762881),
+                new google.maps.LatLng(51.51121389999999,-0.1198244),
+                new google.maps.LatLng(42.3556899,-83.361853),
+                new google.maps.LatLng(33.4483771,-112.0740373),
+                new google.maps.LatLng(45.5234515,-122.6762071),
+                new google.maps.LatLng(43.0730517,-89.4012302),
+                new google.maps.LatLng(36.1031378,-80.202394),
+                new google.maps.LatLng(37.7749295,-122.4194155),
+                new google.maps.LatLng(5.263234100000001,100.4846227),
+                new google.maps.LatLng(35.5950581,-82.5514869),
+                new google.maps.LatLng(35.86166,104.195397),
+                new google.maps.LatLng(34.4208305,-119.6981901),
+                new google.maps.LatLng(1.352083,103.819836),
+                new google.maps.LatLng(36.8507689,-76.28587259999999),
+                new google.maps.LatLng(22.396428,114.109497),
+                new google.maps.LatLng(48.856614,2.3522219),
+                new google.maps.LatLng(40.4167754,-3.7037902),
+                new google.maps.LatLng(18.5204303,73.8567437),
+                new google.maps.LatLng(36.1666667,-86.7833333),
+                new google.maps.LatLng(53.3498053,-6.2603097),
+                new google.maps.LatLng(26.0993883,-80.1343301),
+                new google.maps.LatLng(42.331427,-83.0457538),
+                new google.maps.LatLng(37.82206000000001,-122.272437),
+                new google.maps.LatLng(30.42130899999999,-87.2169149),
+                new google.maps.LatLng(44.4325,26.1038889),
+                new google.maps.LatLng(41.0700485,-81.49516210000002),
+                new google.maps.LatLng(12.9715987,77.5945627),
+                new google.maps.LatLng(53.41291,-8.24389),
+                new google.maps.LatLng(34.0583995,-106.8914159),
+                new google.maps.LatLng(-9.189967,-75.015152),
+                new google.maps.LatLng(55.6760968,12.5683371),
+                new google.maps.LatLng(53.9807737,-6.7148821),
+                new google.maps.LatLng(31.230416,121.473701),
+                new google.maps.LatLng(33.7489954,-84.3879824),
+                new google.maps.LatLng(8.4874949,76.948623),
+                new google.maps.LatLng(13.0524139,80.25082460000002),
+                new google.maps.LatLng(28.0836269,-80.60810889999999),
+                new google.maps.LatLng(39.0457549,-76.64127119999999),
+                new google.maps.LatLng(17.385044,78.486671),
+                new google.maps.LatLng(-23.5489433,-46.6388182),
+                new google.maps.LatLng(52.09179,5.114569899999999),
+                new google.maps.LatLng(19.2667,76.7833),
+                new google.maps.LatLng(19.0759837,72.8776559),
+                new google.maps.LatLng(12.9715987,77.5945627),
+                new google.maps.LatLng(41.1566892,-8.6239254),
+                new google.maps.LatLng(39.90403,116.407526),
+                new google.maps.LatLng(42.3584308,-71.0597732),
+                new google.maps.LatLng(32.725409,-97.3208496),
+                new google.maps.LatLng(39.074208,21.824312),
+                new google.maps.LatLng(10.066049,123.538599),
+                new google.maps.LatLng(37.42410599999999,-122.1660756),
+                new google.maps.LatLng(36.204824,138.252924)
+              ];
+
+        var map;
+        var markers = [];
+        var iterator = 0;
+        var dropped = false;
+        var recentered = false;
+
+        function initialize() {
+            var mapOptions = {
+              center: new google.maps.LatLng(0,0),
+              //draggable: false,
+              //zoomControl: false,
+              scrollwheel: false,
+              streetViewControl: false,
+              mapTypeControl: false,
+              panControl: false,
+              //disableDoubleClickZoom: true,
+              zoom: 2,
+              //disableDefaultUI: true,
+              mapTypeId: google.maps.MapTypeId.ROADMAP
+            };
+            map = new google.maps.Map(document.getElementById("map-canvas"),
+                mapOptions);
+
+            google.maps.event.addDomListener(map, 'idle', function() {
+                        if (recentered == false) {
+                            map.setCenter(new google.maps.LatLng(20,0));
+                            recentered = true;
+                        }
+                    });
+
+            var bounds = new google.maps.LatLngBounds();
+
+            // Extend bounds with each point
+            for (var i = 0; i < points.length; i++) {
+            bounds.extend(points[i]);
+            }
+            map.fitBounds(bounds);
+
+            if (document.hasFocus()) {
+                dropped = true;
+                drop();
+            }
+
+
+        }
+        function drop() {
+            dropped = true;
+            for (var i = 0; i < points.length; i++) {
+                setTimeout(function() {
+                    addMarker();
+                }, i * 50);
+            }
+        }
+
+        function addMarker() {
+            markers.push(new google.maps.Marker({
+                position: points[iterator],
+                map: map,
+                draggable: false,
+                animation: google.maps.Animation.DROP
+            }));
+            iterator++;
+        }
+        
+        google.maps.event.addDomListener(window, 'load', initialize);
+        
+        window.onfocus = function () { 
+            if (dropped == false) {
+                drop(); 
+            }
+        };
+    </script>
+    <% end %>
+
+    <!-- HTML5 shim, for IE6-8 support of HTML5 elements. All other JS at the end of file. -->
+    <!--[if lt IE 9]>
+      <script src="js/html5shiv.js"></script>
+      <script src="js/respond.min.js"></script>
+    <![endif]-->
+</head>
+<body>
+
+    <header class="navbar navbar-inverse navbar-fixed-top bf-docs-nav <%= 'secondary' if @docs or @community %>" role="banner">
+    <div class="container">
+        <div class="navbar-header">
+            <button class="navbar-toggle" type="button" data-toggle="collapse" data-target=".bf-navbar-collapse">
+                <span class="sr-only">Toggle navigation</span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+            </button>
+        </div>
+        <a href="/" class="navbar-brand">
+                <img id="home-logo" src="/img/apache_usergrid_logo_white_small.png" />
+            </a>
+        <nav class="collapse navbar-collapse bf-navbar-collapse" role="navigation">
+            <ul class="nav navbar-nav navbar-right">
+                <li class="<%= 'active' if @community %>"><a href="/community/"><span class="icns icon-group"></span></a></li>
+                <li><a href="docs" target="_blank"><span class="icns icon-book"></span></a></li>
+                <li><a href="http://github.com/apache/incubator-usergrid" target="_blank"><span class="icns icon-github-sign"></span></a></li>
+                <!--<li><a href="https://trello.com/b/exQmJIOn/usergrid" target="_blank"><span class="icns icon-trello"></span></a></li>-->
+                <li><a href="https://issues.apache.org/jira/secure/RapidBoard.jspa?rapidView=23&view=planning&selectedIssue=USERGRID-362&epics=visible" 
+                       target="_blank"><span class="icns icon-bug"></span></a></li>
+                <li><a href="http://stackoverflow.com/search?q=usergrid" target="_blank"><span class="icns icon-stackexchange"></span></a></li>
+                <li><a href="/community/#live"><span class="icns icon-comments"></span></a></li>
+                <!--<li><a href="https://groups.google.com/forum/#!forum/usergrid" target="_blank"><span class="icns icon-envelope"></span></a></li>-->
+                <li><a href="https://twitter.com/usergrid" target="_blank"><span class="icns icon-twitter"></span></a></li>
+                <li><a href="https://cwiki.apache.org/confluence/display/usergrid/" target="_blank"><span class="icns icon-wiki"></span></a></li>
+                <li><a href="/releases/"><span class="icns icon-releases"></span></a></li>
+            </ul>
+        </nav>
+    </div>
+    </header>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/website/tmp/checksums
----------------------------------------------------------------------
diff --git a/website/tmp/checksums b/website/tmp/checksums
new file mode 100644
index 0000000..aff25aa
--- /dev/null
+++ b/website/tmp/checksums
@@ -0,0 +1,2 @@
+{:	data{
�[:	itemI"/bootstrap/bootstrap/:ETI"!UX93XPnLFDyD8XF010lxEWX2r1I=;F[;I"/community/;TI"!49/EqtSDrTvIN1yigaUZoHpR1CA=;F[;I"/css/bootflat-extensions/;TI"!opR0cjims7hkSGL9ll89EfkP8Y8=;F[;I"/css/bootflat-square/;TI"!ahmmWwKbEZfBoqdYMr+CzO1Ddpg=;F[;I"/css/bootflat/;TI"!4CXkIiZTvfYGEwDlXwaKXNNCKos=;F[;I"/css/font-awesome/;TI"!o03XRqSsFHFYz/Jnog9TCk/ALVM=;F[;I"/css/usergrid-site/;TI"!4lHcffPcQpH6sPesUc6Lsdiwsng=;F[;I"/docs/access-token/;TI"!sJ5bFNSo5YkKLDml2z68geJ8dAs=;F[;I"/docs/activity/;TI"!KiGgHHaVhxlsDBHK4wSHU4Kal44=;F[;I"/docs/admin-portal/;TI"!XMUamB9Zbv4UNaBwlUvb6lQpa+U=;F[;I"/docs/admin-user/;TI"!+hqD4loedhmClr+7mduSasvmvho=;F[;I"/docs/app-security/;TI"!qDvCJDxgowf84A/EhuDwO+djtvE=;F[;I"/docs/application/;TI"!vkBomFaAB128x+WbwlvliEfoclE=;F[;I"/docs/applications/;TI"!RBWNfDDIOrpnG4OJYwawdsT4gLY=;F[;I"/docs/assets/;TI"!Rs2i48JEuZfagYUx50eYPZvr3QQ=;F[;I"8/docs/authen
 ticating-users-and-application-clients/;TI"!Wlb0rR0rzBdc1Wol3U+rmAKCFBY=;F[;I"4/docs/authentication-and-access-app-services-0/;TI"!E0jP0LC3vAlLC6Gk5rVeau15vDU=;F[;I" /docs/client-authorization/;TI"!E+099lPotfl3VTpr9Mo2p7GPjKE=;F[;I"/docs/collections/;TI"!7XvRP9SGsCEWTJC5FFg88irvDNg=;F[;I" /docs/creating-collections/;TI"!GgK4/uH7LgLxA5SXngBHt5yG/sg=;F[;I")/docs/creating-custom-data-entities/;TI"!cNJmM0RyZm9W2j/PHxe9HOi+XzA=;F[;I"2/docs/creating-new-application-admin-console/;TI"!RwLQY/flqMOY6cfnYjxnYWdycGw=;F[;I"/docs/data-model/;TI"!d3hy3KjyRuCoZiAUbSOV6ZjxvfI=;F[;I"/docs/data-query-overview/;TI"!lMFiYi0KjHuxAMoo5pPb9iZOmxo=;F[;I"!/docs/default-data-entities/;TI"!N8SRsqPk3NUsKz+xMpG/hCiaXpY=;F[;I" /docs/deleting-collections/;TI"!6k7X+Y5UMjagZXgJ83Y7C+qCEiQ=;F[;I""/docs/deleting-data-entities/;TI"!XhKPWMNLoz9yR/GTb8wEDLmhAng=;F[;I"/docs/device/;TI"!0fhnCWW0jAfyQuymmbHanhVdXIU=;F[;I";/docs/displaying-app
 -services-api-calls-curl-commands/;TI"!hD4+YkGiJ7D1nDvN1Rc3D2tdppY=;F[;I"!/docs/events-and-counters 2/;TI"!0X4WXNhMX1yEgSayQVcaL9vJYfQ=;F[;I"/docs/events-and-counters/;TI"!zYZiuwam5Kgw0v5l/e5eLLGSPTc=;F[;I"/docs/facebook-sign/;TI"!cWucJI/rNBbFZ22w4Y1jgLmryco=;F[;I"/docs/features/;TI"!dt3/nmR9h32O/48gZBIpv4TA+6g=;F[;I"/docs/folder/;TI"!NCc8GlSq7oWSqBFFA2XYjKwNqE4=;F[;I"/docs/geolocation/;TI"!o0jvHi8IDiQMecZW52hXBHOWOLc=;F[;I"*/docs/getting-up-and-running-locally/;TI"!e6jt4UPmK5OzYNLuDQ44XlHagHI=;F[;I"/docs/group 2/;TI"!dbfHreBluYQZEi/qHaXLXNGFquA=;F[;I"/docs/group/;TI"!7qfz7VpryLhSO5r+JfufWn8nxHo=;F[;I"/docs/groups/;TI"!lTAadPa1T79P/H7UE27MuShBH9A=;F[;I"#/docs/html-5-example-messagee/;TI"!asQgmDRF10/zn4ZAbTPwr42Cuf4=;F[;I"/docs/;TI"!0Gc0eBNvMPBoqsifWOJkx9RJ3Jg=;F[;I"5/docs/managing-access-defining-permission-rules/;TI"!EVOxJAt7wHJFQnTVTDMaVzzdn30=;F[;I"/docs/messagee-example/;TI"!H9snglQUO
 iqEnt4DAdpfaq1kWOM=;F[;I"/docs/nodejs-module/;TI"!tjCOmaE8Iqy+1xnnApnzwSMVQOI=;F[;I"/docs/organization/;TI"!Ro2MEXd9f/Ey005gwBqWommH12g=;F[;I""/docs/organizations-admins 2/;TI"!SyzmVE6JhswIYyfkZ8LM3k7GGGQ=;F[;I" /docs/organizations-admins/;TI"!LGMnDOIJyNiaA05u/YFYA4pFTFE=;F[;I"/docs/overview/;TI"!IM616gkwwWCLYA1cyuYcYV1SlJA=;F[;I"/docs/query-language/;TI"!FXh38MitlyTgvfavxf9oeVDYB04=;F[;I"&/docs/querying-data-admin-portal/;TI"!d1SmVP4424Upyd53X7VsKWg6WWs=;F[;I"+/docs/querying-your-app-services-data/;TI"!OjvFQQI/P+utnPIOWPTnKYsvbjM=;F[;I"/docs/relationships/;TI"!i6s/7OInIhyELY+jhpcJn6ze1XQ=;F[;I"/docs/rest-api/;TI"!zkSo5PrH4bNT9Fkg9IotmpUlF3w=;F[;I"/docs/rest-endpoints/;TI"!XsjMPez5lIGzwp21XS4fE27kRvc=;F[;I""/docs/retrieving-collections/;TI"!Rwoo5Ac7/GlSNzXOwNM1ODnhYqM=;F[;I"$/docs/retrieving-data-entities/;TI"!NCxcYpGq+lM5+G96/Alj8r0F5r4=;F[;I"/docs/role/;TI"!30Miopbr8+vTF3ofRrAc65ejkVY=;F[
 ;I"!/docs/roles-and-permissions/;TI"!x6yz2EHMvCwroiAex/fbdSpyS3Y=;F[;I"/docs/ruby-gem/;TI"!FWS8NAksszPnlzGPVRWmzHc6MfA=;F[;I"/docs/securing-your-app/;TI"!O/LZpfS6mHX83Ot5o846lJpjH1c=;F[;I"/docs/security-model/;TI"!zgeJsYPhkvGJ494pYzQdhkbtZqs=;F[;I" /docs/updating-collections/;TI"!MU5pYESVEfLJ9zNxmYrcCZxjyGE=;F[;I""/docs/updating-data-entities/;TI"!Un1y0x108XS1qLe4kKe92sg7vEs=;F[;I"/docs/upgrading/;TI"!/Gagi05VTncMU2dVig8Tm6DhX1U=;F[;I"&/docs/uploading-files-and-assets/;TI"!pslYeOoUmk6B9Y09vtzuXQ995zs=;F[;I"/docs/user/;TI"!GIff/8+sc4WsHVfbFjqiJl4PnPs=;F[;I"/docs/users-devices/;TI"!8FsDxWVeQhd/8WW/DCtrURhC8yo=;F[;I"/docs/using-api/;TI"!DWLCS7/PYLtZ2iDbnk5tJ05pkVg=;F[;I"%/docs/using-sandbox-application/;TI"!RWzmW0icE4mkU6h41PvCf85o1O8=;F[;I"/favicon/;TI"!OLxQ8ErXT/0xQVS4s2B3ot607HU=;F[;I"#/font/fontawesome-webfont-eot/;TI"!6/YrsytfwnHZEAmVanhjYfqLT1w=;F[;I"#/font/fontawesome-webfont-svg/;TI"
 !ln3rJPg6ZKzAfTE1CpHGZGn0sm4=;F[;I"#/font/fontawesome-webfont-ttf/;TI"!JArPjvJ4tDzA/tPBNuQZQBPA2LU=;F[;I"$/font/fontawesome-webfont-woff/;TI"!KGowG+qs0SvXXJoZwFgktVpYFE4=;F[;I"/font/FontAwesome/;TI"!XNHLOH7drwf3xamKwm6pi+iyVcM=;F[;I"/img/alberto/;TI"!G/puDUV77NdctY0bblHwLR3SUWs=;F[;I"/img/alex/;TI"!/EW8fGOK8kayjvwYnJ9CWrNaPMg=;F[;I""/img/apache_usergrid_favicon/;TI"!k64gX3pMFYzMpUgTWX0/iFPbzpY=;F[;I"%/img/apache_usergrid_logo_white/;TI"!c8yHE9nnG5js9/2WO+5oJTtLSs4=;F[;I"+/img/apache_usergrid_logo_white_small/;TI"!qRxSGezvFKeU904JzW+JECqd4Dw=;F[;I"/img/check_flat/default/;TI"!wweg+TSTnsrlXcgpMTCXnfTv3Ts=;F[;I"/img/dave/;TI"!CJo3NeC3tEi9wchL6FTf/s3O5Zg=;F[;I"
/img/ed/;TI"!kSN2p8G9amAK2h3k3IBUYM8RzFc=;F[;I"/img/egg-logo/;TI"!iid1SPvl3IOcJfe54K3KYYPdWMo=;F[;I"/img/grey/;TI"!0j/yK6ksEGAslBXZHJ07PvP5kQQ=;F[;I"/img/nate/;TI"!3xx7EBTskWymUUjRlj3iwPr84fU=;F[;I"/img/rod/;TI"!Vb9yzMw7grRQ1ZvTfTgV
 iJ8Bspo=;F[;I"/img/scott/;TI"!eKpF/fRf6IifEMaG3eNNqtFnugM=;F[;I"/img/strong/;TI"!SXcS9FYWt33nC6TkuVudT8vaVWU=;F[;I"/img/sungju/;TI"!LpyCusX73mAojpxYLNP4zE/BFCQ=;F[;I"/img/tim/;TI"!F4TUjvcVto24a78H8qnEpPSVeTw=;F[;I"/img/todd/;TI"!Tsl/sCFaZMXOgdY6W6KtGKeUfjU=;F[;I"/img/usergrid-logo/;TI"!FMn+BPORWmvVZKqYkAKOJdBfy+0=;F[;I"/img/usergrid/;TI"!oy6NPpvauKKIXSPuJTBik8O7Ef4=;F[;I"/img/usergrid_160/;TI"!yqVs1z46EctOfGrka1U6sli2kkg=;F[;I"/img/usergrid_200/;TI"!And0CrWJb98+d7e5gV+dm5Af4A8=;F[;I"/img/usergrid_300/;TI"!swjlrK9ovJ5K1Zwo78r7nuptt7g=;F[;I"#/img/usergrid_300_transparent/;TI"!iJjyFH9NHLU/DpTCe2Xx9KSU96c=;F[;I"/img/usergrid_400/;TI"!YBb5d3gsPuO+3EuUOqm/hGC7yho=;F[;I"/img/usergrid_800/;TI"!rzaEuT3xIZRoJcu00v4hEr8QZk4=;F[;I"/img/usergrid_card/;TI"!95yKbxbPp7wzxx7tpMGttJb03UY=;F[;I"/img/usergrid_logo/;TI"!sFaRm4isJK+htlyyKqzzd7Pn3l0=;F[;I"/img/usergrid_logo_205_50/;TI"!fZyZT8DDvj
 7PNO+kT8VUpxCUxY4=;F[;I"/img/usergrid_logo_260_50/;TI"!mvyKLJzofFU/wtfnCIkb0RoigvQ=;F[;I"/img/usergrid_logo_720/;TI"!Sgx8JBVlhBqsoLnMwk+V+CnhuEQ=;F[;I"/img/usergrid_logo_720p/;TI"!5Sp380wN4WtMrpS5hbnsYnGtmZg=;F[;I" /img/usergrid_logo_900_200/;TI"!pc+JmD7+pDLmTg+6UNVOWdSIq+Y=;F[;I"/img/usergrid_logo_white/;TI"!jogEbf8m34FR01OZZ+mnixjwqhs=;F[;I"/img/usergrid_profile_128/;TI"!mFLx/BwBTQqSY1FJJDeEHlSlSiY=;F[;I"/img/usergrid_profile_256/;TI"!Ke2CDPgjbwP0rg8jUzxIsOdlLXk=;F[;I"%/img/usergrid_profile_256_white/;TI"!to9N1HI6hG3bBcqFLv4W9d4teUs=;F[;I"'/img/usergrid_profile_512_margins/;TI"!npGFb2y+bxErvommrupVW+ZuJ5w=;F[;I"$/img/usergrid_profile_64_white/;TI"!fzlXlPBrpH1/k6sR4hB7Y8Y0pK4=;F[;I"&/img/usergrid_profile_background/;TI"!k8wWDAB25YLtwWScW3TgQEpGuSs=;F[;I"!/img/usergrid_screencast_bg/;TI"!31q7874rwUqa6lv1Jlh1kNOrod8=;F[;I"/img/usergrid_small_100/;TI"!AiRJnZKOeIfSGqtgRYMN1kESnco=;F[;I"/img/usergr
 id_wiki/;TI"!OjS8Wweix1KQ+qoVajeIJSztUlA=;F[;I"/;TI"!Q5DIF5nRoiogS4BkhrEgBYmR84g=;F[;I"/js/bootstrap/;TI"!BtKopvK+9u/oZXADRJo89sdwc8E=;F[;I"/js/head/;TI"!+Hf4ESgYFiFLXCbd0Xb2rV6TKbQ=;F[;I"/js/html5shiv/;TI"!iETKkQSx2doTL4EKRHISScT2NuI=;F[;I"/js/jquery-1/;TI"!bXtX2g6/HqMIdBN0dLpAQYpA2ws=;F[;I"/js/jquery/;TI"!41h5fqXtaJrInWYaB5+QNd01WGs=;F[;I"/js/respond/;TI"!q1buQ19NZtFqjJorJfRvgXKIPks=;F[;I"/js/usergrid-site/;TI"!/nr1TmnOScV/a4AqnYvGj71SIx4=;F[;I"/static/github-btn/;TI"!vnSME9sRCDXUOGFxaizFz61GWRw=;F[:layoutI"/community/;TI"!Vz6WtgEl8BB6t96FGbzN5hhVc4c=;F[;I"/default/;TI"!k9I6lOQ4z4+nHoc8WQw7P2MoKbY=;F[;I"/docs/;TI"!tmBld5ZHivR/56iHwp6I0LUoPlc=;F[;I"
/footer/;TI"!A2Bvp2oFTYnDJ/cc9h+T+Qf/8Y4=;F[;I"
/header/;TI"!YvLsUtwP7SNsyjfKnc0z31F0Kio=;F[:code_snippetI"lib/default.rb;TI"!obtwYGHKsZcksb03nMTPrlOqd5U=;F[;	I"lib/helpers_.rb;TI"!huKhcwQYeoQiIuYmRpgzAwKwrbc=;F:configI"!Sxv
 usj+Tnw1yNJuSGRkZ7fv3R2Q=;F:
+rulesI"!nclWn6tIAjzNd8AV/It9HpNy9y0=;F[;I"/docs/contribute-code/;TI"!4qf8xPP00M97O2Mn7aYskiaZHbY=;F[;I"/docs/contributecode/;TI"Vf83fd7240a06d583d5e2b6f5b79d2d41b4f40e43,1d274687d36e5d4c2895acd54366d5b20424dd7b;F[;I"/docs/deploy-local/;TI"!I27C7JJfNAkb4Ex6xYv/m1OA/iA=;F[;I"/img/shawn/;TI"!BiPuzprXnYTUvsGYH9LNpTWQdDU=;F[;I"/docs/old-forks/;TI"!3TvEGi1GeqC18Y/Dd6Uxm2vcKXM=;F[;I"/docs/presentations/;TI"!6RN7MD+JH6zEZ7rrLv/L1s6i2s4=;F[;I"/docs/videos/;TI"!U/emu6XGZOBxvjxIiDIWcXWGkAw=;F[;I"/img/github/;TI"!Ix0MCoVNAXiXe357dU8T31+hjd0=;F[;I"/img/stliu/;TI"!0boMj0nkO0ERmKQJjAcxDziHTBc=;F[;I"/releases/;TI"!PO3ADljBwIQXBoR5tou0wBjWovI=;F[;I"/img/intellij/;TI"!qSQ2o1ZY5UHLjQd7SrKq6Wr4bQE=;F[;I"/img/structure101/;TI"!/J4FqIbPo/DuQCPEQmYx7YN15eA=;F[;I"/img/yourkit/;TI"!w/mtzt7B3RMaVLNaKraUMs2kw6s=;F[;I"/img/jeff/;TI"!jtJr59eWB647X2vPsz6A/S1SeJA=;F:versioni
\ No newline at end of file

[25/60] [abbrv] incubator-usergrid git commit: cherry picking docs from master

[sn...@apache.org]

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/asset-and-files/folders.html
----------------------------------------------------------------------
diff --git a/content/docs/asset-and-files/folders.html b/content/docs/asset-and-files/folders.html
new file mode 100644
index 0000000..3692c48
--- /dev/null
+++ b/content/docs/asset-and-files/folders.html
@@ -0,0 +1,388 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>Folders &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+        <link rel="next" title="Counters &amp; events" href="../counters-and-events/events-and-counters.html"/>
+        <link rel="prev" title="Retrieving assets" href="retrieving-assets.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">Folders</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#linking-a-folder-to-an-asset">Linking a folder to an asset</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#retrieve-list-of-folder-assets">Retrieve list of folder assets</a></li>
+</ul>
+</li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>Folders</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/asset-and-files/folders.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="folders">
+<h1>Folders<a class="headerlink" href="#folders" title="Permalink to this headline">¶</a></h1>
+<div class="section" id="linking-a-folder-to-an-asset">
+<h2>Linking a folder to an asset<a class="headerlink" href="#linking-a-folder-to-an-asset" title="Permalink to this headline">¶</a></h2>
+<p>In order to access the asset for the image in the folder, you need to
+link the folder to the asset. You can do that by issuing a POST request
+in the following format:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">POST</span> <span class="o">/</span><span class="p">{</span><span class="n">org</span><span class="o">-</span><span class="n">uuid</span><span class="p">}</span><span class="o">/</span><span class="p">{</span><span class="n">app</span><span class="o">-</span><span class="n">uuid</span><span class="p">}</span><span class="o">/</span><span class="n">folders</span><span class="o">/</span><span class="p">{</span><span class="n">folder</span><span class="o">-</span><span class="n">uuid</span><span class="p">}</span><span class="o">/</span><span class="n">assets</span><span class="o">/</span><span class="p">{</span><span class="n">assets_id</span><span class="p">}</span>
+</pre></div>
+</div>
+<p>where <code class="docutils literal"><span class="pre">{folder-uuid}</span></code> is the UUID of the folder, and <code class="docutils literal"><span class="pre">{assets-uuid}</span></code>
+is the UUID of the assets entity.</p>
+<p>Here’s how you could link the folder and the asset you created for the
+my-image.jpg image:</p>
+<div class="highlight-python"><div class="highlight"><pre>POST https://api.usergrid.com/my-org/my-app/folders/6640a601-2ac6-11e2-92c3-02e81ae640dc/assets/9501cda1-2d21-11e2-b4c6-02e81ac5a17b
+</pre></div>
+</div>
+<p>In the response, you should see the assets entity for the image added to
+the folder:</p>
+<div class="highlight-python"><div class="highlight"><pre>{
+  &quot;action&quot;: &quot;post&quot;,
+  &quot;application&quot;: &quot;3400ba10-cd0c-11e1-bcf7-12313d1c4491&quot;,
+  &quot;params&quot;: {},
+  &quot;path&quot;: &quot;/folders/6640a601-2ac6-11e2-92c3-02e81ae640dc/assets&quot;,
+  &quot;uri&quot;: &quot;https://api.usergrid.com/my-org/my-app/folders/6640a601-2ac6-11e2-92c3-02e81ae640dc/assets&quot;,
+  &quot;entities&quot;: [
+    {
+      &quot;uuid&quot;: &quot;9501cda1-2d21-11e2-b4c6-02e81ac5a17b&quot;,
+      &quot;type&quot;: &quot;asset&quot;,
+      &quot;name&quot;: &quot;my-image.jpg&quot;,
+      &quot;created&quot;: 1352763303163,
+      &quot;modified&quot;: 1352763303163,
+      &quot;metadata&quot;: {
+        &quot;path&quot;: &quot;/folders/6640a601-2ac6-11e2-92c3-02e81ae640dc/assets/9501cda1-2d21-11e2-b4c6-02e81ac5a17b&quot;
+      },
+      &quot;owner&quot;: &quot;5c0c1789-d503-11e1-b36a-12313b01d5c1&quot;,
+      &quot;path&quot;: &quot;/myassets/asset1&quot;
+    }
+  ],
+  &quot;timestamp&quot;: 1352830448045,
+  &quot;duration&quot;: 54,
+  &quot;organization&quot;: &quot;my-org”,
+  &quot;applicationName&quot;: &quot;my-app&quot;
+}
+</pre></div>
+</div>
+</div>
+<div class="section" id="retrieve-list-of-folder-assets">
+<h2>Retrieve list of folder assets<a class="headerlink" href="#retrieve-list-of-folder-assets" title="Permalink to this headline">¶</a></h2>
+<p>You can also request a list of the linked contents of the folder like
+this:</p>
+<div class="highlight-python"><div class="highlight"><pre>GET https://api.usergrid.com/my-org/my-app/folders/6640a601-2ac6-11e2-92c3-02e81ae640dc/assets
+</pre></div>
+</div>
+<p>The response should look something like this:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+  <span class="s">&quot;action&quot;</span><span class="p">:</span> <span class="s">&quot;get&quot;</span><span class="p">,</span>
+  <span class="s">&quot;application&quot;</span><span class="p">:</span> <span class="s">&quot;3400ba10-cd0c-11e1-bcf7-12313d1c4491&quot;</span><span class="p">,</span>
+  <span class="s">&quot;params&quot;</span><span class="p">:</span> <span class="p">{</span>
+    <span class="s">&quot;_&quot;</span><span class="p">:</span> <span class="p">[</span>
+      <span class="s">&quot;1352830364891&quot;</span>
+    <span class="p">]</span>
+  <span class="p">},</span>
+  <span class="s">&quot;path&quot;</span><span class="p">:</span> <span class="s">&quot;/folders/6640a601-2ac6-11e2-92c3-02e81ae640dc/assets&quot;</span><span class="p">,</span>
+  <span class="s">&quot;uri&quot;</span><span class="p">:</span> <span class="s">&quot;https://api.usergrid.com/my-org/my-app/folders/6640a601-2ac6-11e2-92c3-02e81ae640dc/assets&quot;</span><span class="p">,</span>
+  <span class="s">&quot;entities&quot;</span><span class="p">:</span> <span class="p">[</span>
+    <span class="p">{</span>
+      <span class="s">&quot;uuid&quot;</span><span class="p">:</span> <span class="s">&quot;7bf47435-2ac8-11e2-b4c6-02e81ac5a17b&quot;</span><span class="p">,</span>
+      <span class="s">&quot;type&quot;</span><span class="p">:</span> <span class="s">&quot;asset&quot;</span><span class="p">,</span>
+      <span class="s">&quot;name&quot;</span><span class="p">:</span> <span class="s">&quot;my-image.jpg&quot;</span><span class="p">,</span>
+      <span class="s">&quot;created&quot;</span><span class="p">:</span> <span class="mi">1352505133598</span><span class="p">,</span>
+      <span class="s">&quot;modified&quot;</span><span class="p">:</span> <span class="mi">1352507245108</span><span class="p">,</span>
+      <span class="s">&quot;checksum&quot;</span><span class="p">:</span> <span class="s">&quot;8e0cd3866ee20746c99e9a9825f38ad8&quot;</span><span class="p">,</span>
+      <span class="s">&quot;content-length&quot;</span><span class="p">:</span> <span class="mi">11853</span><span class="p">,</span>
+      <span class="s">&quot;content-type&quot;</span><span class="p">:</span> <span class="s">&quot;image/jpeg&quot;</span><span class="p">,</span>
+      <span class="s">&quot;etag&quot;</span><span class="p">:</span> <span class="s">&quot;</span><span class="se">\&quot;</span><span class="s">8e0cd3866ee20746c99e9a9825f38ad8</span><span class="se">\&quot;</span><span class="s">&quot;</span><span class="p">,</span>
+      <span class="s">&quot;metadata&quot;</span><span class="p">:</span> <span class="p">{</span>
+        <span class="s">&quot;connecting&quot;</span><span class="p">:</span> <span class="p">{</span>
+          <span class="s">&quot;assets&quot;</span><span class="p">:</span> <span class="s">&quot;/folders/6640a601-2ac6-11e2-92c3-02e81ae640dc/assets/7bf47435-2ac8-11e2-b4c6-02e81ac5a17b/connecting/assets&quot;</span>
+        <span class="p">},</span>
+        <span class="s">&quot;connection&quot;</span><span class="p">:</span> <span class="s">&quot;assets&quot;</span><span class="p">,</span>
+        <span class="s">&quot;path&quot;</span><span class="p">:</span> <span class="s">&quot;/folders/6640a601-2ac6-11e2-92c3-02e81ae640dc/assets/7bf47435-2ac8-11e2-b4c6-02e81ac5a17b&quot;</span>
+      <span class="p">},</span>
+      <span class="s">&quot;owner&quot;</span><span class="p">:</span> <span class="s">&quot;5c0c1789-d503-11e1-b36a-12313b01d5c1&quot;</span><span class="p">,</span>
+      <span class="s">&quot;path&quot;</span><span class="p">:</span> <span class="s">&quot;my-image&quot;</span>
+    <span class="p">}</span>
+  <span class="p">],</span>
+  <span class="s">&quot;timestamp&quot;</span><span class="p">:</span> <span class="mi">1352830363797</span><span class="p">,</span>
+  <span class="s">&quot;duration&quot;</span><span class="p">:</span> <span class="mi">57</span><span class="p">,</span>
+  <span class="s">&quot;organization&quot;</span><span class="p">:</span> <span class="s">&quot;my-org&quot;</span><span class="p">,</span>
+  <span class="s">&quot;applicationName&quot;</span><span class="p">:</span> <span class="s">&quot;my-app&quot;</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+      
+        <a href="../counters-and-events/events-and-counters.html" class="btn btn-neutral float-right" title="Counters &amp; events" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+      
+      
+        <a href="retrieving-assets.html" class="btn btn-neutral" title="Retrieving assets" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+      
+    </div>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/asset-and-files/legacy-asset-support.html
----------------------------------------------------------------------
diff --git a/content/docs/asset-and-files/legacy-asset-support.html b/content/docs/asset-and-files/legacy-asset-support.html
new file mode 100644
index 0000000..7196216
--- /dev/null
+++ b/content/docs/asset-and-files/legacy-asset-support.html
@@ -0,0 +1,277 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>&lt;no title&gt; &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>&lt;no title&gt;</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/asset-and-files/legacy-asset-support.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  
+
+           </div>
+          </div>
+          <footer>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/asset-and-files/retrieving-assets.html
----------------------------------------------------------------------
diff --git a/content/docs/asset-and-files/retrieving-assets.html b/content/docs/asset-and-files/retrieving-assets.html
new file mode 100644
index 0000000..8a76551
--- /dev/null
+++ b/content/docs/asset-and-files/retrieving-assets.html
@@ -0,0 +1,356 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>Retrieving assets &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+        <link rel="next" title="Folders" href="folders.html"/>
+        <link rel="prev" title="Uploading assets" href="uploading-assets.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">Retrieving assets</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#retrieving-asset-data">Retrieving asset data</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#request-syntax">Request syntax</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#example-request">Example request</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#retrieving-an-asset-entity">Retrieving an asset entity</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>Retrieving assets</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/asset-and-files/retrieving-assets.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="retrieving-assets">
+<h1>Retrieving assets<a class="headerlink" href="#retrieving-assets" title="Permalink to this headline">¶</a></h1>
+<div class="section" id="retrieving-asset-data">
+<h2>Retrieving asset data<a class="headerlink" href="#retrieving-asset-data" title="Permalink to this headline">¶</a></h2>
+<p>To retrieve the asset from an entity, send a <code class="docutils literal"><span class="pre">GET</span></code> request with the
+<code class="docutils literal"><span class="pre">Accept</span></code> header set to the content type of the asset. The content type
+can be retrieved from the <code class="docutils literal"><span class="pre">file-metadata.content-type</span></code> property of the
+entity the asset is attached to.</p>
+<div class="section" id="request-syntax">
+<h3>Request syntax<a class="headerlink" href="#request-syntax" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X GET -H &#39;Accept: &lt;content_type&gt;&#39; &#39;https://api.usergrid.com/&lt;org&gt;/&lt;app&gt;/&lt;collection&gt;/&lt;entity&gt;
+</pre></div>
+</div>
+<p>Parameters</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="20%" />
+<col width="80%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>content_type</td>
+<td>The content type of the attached asset. For example, text/plain, image/jpeg.</td>
+</tr>
+<tr class="row-odd"><td>org Organization</td>
+<td>UUID or organization name</td>
+</tr>
+<tr class="row-even"><td>app Application</td>
+<td>UUID or application name</td>
+</tr>
+<tr class="row-odd"><td>collection</td>
+<td>Name or UUID of the collection of the entity the asset is attached to.</td>
+</tr>
+<tr class="row-even"><td>entity</td>
+<td>Name or UUID of the entity the asset is attached to.</td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="section" id="example-request">
+<h3>Example request<a class="headerlink" href="#example-request" title="Permalink to this headline">¶</a></h3>
+<p>The following request will retrieve the data for a jpeg file attached to
+an entity named &#8216;cloud&#8217; in the &#8216;pictures&#8217; collection:</p>
+<div class="highlight-python"><div class="highlight"><pre>curl -X GET -H &#39;Accept: image/jpeg&#39; &#39;https://api.usergrid.com/your-org/your-app/pictures/cloud
+</pre></div>
+</div>
+</div>
+</div>
+<div class="section" id="retrieving-an-asset-entity">
+<h2>Retrieving an asset entity<a class="headerlink" href="#retrieving-an-asset-entity" title="Permalink to this headline">¶</a></h2>
+<p>To retrieve the entity that an asset is attached to, perform a <code class="docutils literal"><span class="pre">GET</span></code>
+request as you normally would to retrieve an entity. For more
+information, see <a class="reference external" href="../data-storage/entities.html#retrieving-data-entities">Retrieving Data
+Entities</a>.</p>
+</div>
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+      
+        <a href="folders.html" class="btn btn-neutral float-right" title="Folders" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+      
+      
+        <a href="uploading-assets.html" class="btn btn-neutral" title="Uploading assets" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+      
+    </div>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/asset-and-files/uploading-assets.html
----------------------------------------------------------------------
diff --git a/content/docs/asset-and-files/uploading-assets.html b/content/docs/asset-and-files/uploading-assets.html
new file mode 100644
index 0000000..8143f88
--- /dev/null
+++ b/content/docs/asset-and-files/uploading-assets.html
@@ -0,0 +1,416 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>Uploading assets &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+        <link rel="next" title="Retrieving assets" href="retrieving-assets.html"/>
+        <link rel="prev" title="Geolocating your Entities" href="../geolocation/geolocation.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul class="current">
+<li class="toctree-l1 current"><a class="current reference internal" href="">Uploading assets</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#id1">Uploading assets</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#request-syntax">Request syntax</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#example-request">Example request</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#example-response">Example response</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#updating-assets">Updating assets</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>Uploading assets</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/asset-and-files/uploading-assets.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="uploading-assets">
+<h1>Uploading assets<a class="headerlink" href="#uploading-assets" title="Permalink to this headline">¶</a></h1>
+<p>With Usergrid, you can store and retrieve files and assets that hold
+data objects such as images, video, and audio content.</p>
+<p>Usergrid manages these objects as Asset entities. Optionally, you can
+use Folder entities to organize related assets.</p>
+<div class="section" id="id1">
+<h2>Uploading assets<a class="headerlink" href="#id1" title="Permalink to this headline">¶</a></h2>
+<p>Assets can be any file type and can be attached to any entity. When an
+asset is uploaded, Usergrid will automatically detect the file metadata
+for the asset and save it in the associated entity as a
+<code class="docutils literal"><span class="pre">file-metadata</span></code> property. Only 1 asset can be attached to an entity.</p>
+<p>To attach an asset to an entity, do the following:</p>
+<div class="section" id="request-syntax">
+<h3>Request syntax<a class="headerlink" href="#request-syntax" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X POST -F name=&#39;&lt;filename&gt;&#39; -F file=@&lt;file_location&gt; &#39;https://api.usergrid.com/&lt;org&gt;/&lt;app&gt;/&lt;collection&gt;/&lt;entity&gt;
+</pre></div>
+</div>
+<p>Parameters</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="20%" />
+<col width="80%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>filename</td>
+<td>A filename to associate with the asset.</td>
+</tr>
+<tr class="row-odd"><td>file_location</td>
+<td>The location of the asset to be uploaded.</td>
+</tr>
+<tr class="row-even"><td>org Organization</td>
+<td>UUID or organization name</td>
+</tr>
+<tr class="row-odd"><td>app Application</td>
+<td>UUID or application name</td>
+</tr>
+<tr class="row-even"><td>collection</td>
+<td>Name or UUID of the collection of the entity you want to attach the asset to.</td>
+</tr>
+<tr class="row-odd"><td>entity</td>
+<td>Name or UUID of an existing entity you want to attach the asset to.</td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="section" id="example-request">
+<h3>Example request<a class="headerlink" href="#example-request" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X POST -i -F name=&#39;clouds&#39; -F file=@happy_clouds.jpg &#39;https://api.usergrid.com/your-org/your-app/pictures/&#39;
+</pre></div>
+</div>
+</div>
+<div class="section" id="example-response">
+<h3>Example response<a class="headerlink" href="#example-response" title="Permalink to this headline">¶</a></h3>
+<p>Notice the <code class="docutils literal"><span class="pre">file-metadata</span></code> property in the response.</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+    <span class="s">&quot;action&quot;</span> <span class="p">:</span> <span class="s">&quot;post&quot;</span><span class="p">,</span>
+    <span class="s">&quot;application&quot;</span> <span class="p">:</span> <span class="s">&quot;f34f4222-a166-11e2-a7f7-02e81adcf3d0&quot;</span><span class="p">,</span>
+    <span class="s">&quot;params&quot;</span> <span class="p">:</span> <span class="p">{</span> <span class="p">},</span>
+    <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span class="s">&quot;/users&quot;</span><span class="p">,</span>
+    <span class="s">&quot;uri&quot;</span> <span class="p">:</span> <span class="s">&quot;https://api.usergrid.com/amuramoto/sandbox/pictures&quot;</span><span class="p">,</span>
+    <span class="s">&quot;entities&quot;</span> <span class="p">:</span> <span class="p">[</span> <span class="p">{</span>
+    <span class="s">&quot;uuid&quot;</span> <span class="p">:</span> <span class="s">&quot;410b213a-b379-11e3-a0e5-9953085ea376&quot;</span><span class="p">,</span>
+    <span class="s">&quot;type&quot;</span> <span class="p">:</span> <span class="s">&quot;user&quot;</span><span class="p">,</span>
+    <span class="s">&quot;name&quot;</span> <span class="p">:</span> <span class="s">&quot;test&quot;</span><span class="p">,</span>
+    <span class="s">&quot;created&quot;</span> <span class="p">:</span> <span class="mi">1395681911491</span><span class="p">,</span>
+    <span class="s">&quot;modified&quot;</span> <span class="p">:</span> <span class="mi">1399069838919</span><span class="p">,</span>
+    <span class="s">&quot;name&quot;</span> <span class="p">:</span> <span class="s">&quot;clouds&quot;</span><span class="p">,</span>
+    <span class="s">&quot;file&quot;</span> <span class="p">:</span> <span class="s">&quot;fobnszewobnioerabnoiawegbrn</span><span class="se">\n</span><span class="s">&quot;</span><span class="p">,</span>
+    <span class="s">&quot;file-metadata&quot;</span> <span class="p">:</span> <span class="p">{</span>
+      <span class="s">&quot;content-type&quot;</span> <span class="p">:</span> <span class="s">&quot;image/jpeg&quot;</span><span class="p">,</span>
+      <span class="s">&quot;etag&quot;</span> <span class="p">:</span> <span class="s">&quot;</span><span class="se">\&quot;</span><span class="s">2e1db7299b0a667ed80e674a0ef9d653</span><span class="se">\&quot;</span><span class="s">&quot;</span><span class="p">,</span>
+      <span class="s">&quot;last-modified&quot;</span> <span class="p">:</span> <span class="mi">1399070010115</span><span class="p">,</span>
+      <span class="s">&quot;content-length&quot;</span> <span class="p">:</span> <span class="mi">28</span><span class="p">,</span>
+      <span class="s">&quot;checksum&quot;</span> <span class="p">:</span> <span class="s">&quot;2e1db7299b0a667ed80e674a0ef9d653&quot;</span>
+    <span class="p">},</span>
+    <span class="s">&quot;metadata&quot;</span> <span class="p">:</span> <span class="p">{</span>
+      <span class="s">&quot;connecting&quot;</span> <span class="p">:</span> <span class="p">{</span>
+        <span class="s">&quot;likes&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/410b213a-b379-11e3-a0e5-9953085ea376/connecting/likes&quot;</span>
+      <span class="p">},</span>
+      <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/410b213a-b379-11e3-a0e5-9953085ea376&quot;</span><span class="p">,</span>
+      <span class="s">&quot;sets&quot;</span> <span class="p">:</span> <span class="p">{</span>
+        <span class="s">&quot;rolenames&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/410b213a-b379-11e3-a0e5-9953085ea376/roles&quot;</span><span class="p">,</span>
+        <span class="s">&quot;permissions&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/410b213a-b379-11e3-a0e5-9953085ea376/permissions&quot;</span>
+      <span class="p">},</span>
+      <span class="s">&quot;connections&quot;</span> <span class="p">:</span> <span class="p">{</span>
+        <span class="s">&quot;follows&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/410b213a-b379-11e3-a0e5-9953085ea376/follows&quot;</span>
+      <span class="p">},</span>
+      <span class="s">&quot;collections&quot;</span> <span class="p">:</span> <span class="p">{</span>
+        <span class="s">&quot;activities&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/410b213a-b379-11e3-a0e5-9953085ea376/activities&quot;</span><span class="p">,</span>
+        <span class="s">&quot;devices&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/410b213a-b379-11e3-a0e5-9953085ea376/devices&quot;</span><span class="p">,</span>
+        <span class="s">&quot;feed&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/410b213a-b379-11e3-a0e5-9953085ea376/feed&quot;</span><span class="p">,</span>
+        <span class="s">&quot;groups&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/410b213a-b379-11e3-a0e5-9953085ea376/groups&quot;</span><span class="p">,</span>
+        <span class="s">&quot;roles&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/410b213a-b379-11e3-a0e5-9953085ea376/roles&quot;</span><span class="p">,</span>
+        <span class="s">&quot;following&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/410b213a-b379-11e3-a0e5-9953085ea376/following&quot;</span><span class="p">,</span>
+        <span class="s">&quot;followers&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/410b213a-b379-11e3-a0e5-9953085ea376/followers&quot;</span>
+      <span class="p">}</span>
+    <span class="p">}</span>
+    <span class="p">}</span> <span class="p">],</span>
+    <span class="s">&quot;timestamp&quot;</span> <span class="p">:</span> <span class="mi">1399070009986</span><span class="p">,</span>
+    <span class="s">&quot;duration&quot;</span> <span class="p">:</span> <span class="mi">441</span><span class="p">,</span>
+    <span class="s">&quot;organization&quot;</span> <span class="p">:</span> <span class="s">&quot;your-org&quot;</span><span class="p">,</span>
+    <span class="s">&quot;applicationName&quot;</span> <span class="p">:</span> <span class="s">&quot;your-app&quot;</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+</div>
+<div class="section" id="updating-assets">
+<h2>Updating assets<a class="headerlink" href="#updating-assets" title="Permalink to this headline">¶</a></h2>
+<p>To update the data for an asset, perform the same request outlined above
+in &#8216;Uploading assets&#8217; as a <code class="docutils literal"><span class="pre">PUT</span></code> request rather than a <code class="docutils literal"><span class="pre">POST</span></code>.</p>
+</div>
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+      
+        <a href="retrieving-assets.html" class="btn btn-neutral float-right" title="Retrieving assets" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+      
+      
+        <a href="../geolocation/geolocation.html" class="btn btn-neutral" title="Geolocating your Entities" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+      
+    </div>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

[15/60] [abbrv] incubator-usergrid git commit: cherry picking docs from master

[sn...@apache.org]

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/introduction/usergrid-features.html
----------------------------------------------------------------------
diff --git a/content/docs/introduction/usergrid-features.html b/content/docs/introduction/usergrid-features.html
new file mode 100644
index 0000000..496a33d
--- /dev/null
+++ b/content/docs/introduction/usergrid-features.html
@@ -0,0 +1,449 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>Usergrid Features &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+        <link rel="next" title="Usergrid Data model" href="data-model.html"/>
+        <link rel="prev" title="Apache Usergrid Documentation" href="../index.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul class="current">
+<li class="toctree-l1 current"><a class="current reference internal" href="">Usergrid Features</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#data-storage-management">Data storage &amp; management</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#application-data">Application data</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#files-assets">Files &amp; assets</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#flexible-data-querying">Flexible data querying</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#social">Social</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#entity-relationships">Entity relationships</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#activity-streams">Activity streams</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#user-management">User management</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#registration-and-login">Registration and login</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#roles-permissions">Roles &amp; permissions</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#groups">Groups</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#third-party-authentication">Third-party authentication</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#geolocation">Geolocation</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#push-notifications">Push notifications</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>Usergrid Features</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/introduction/usergrid-features.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="usergrid-features">
+<h1>Usergrid Features<a class="headerlink" href="#usergrid-features" title="Permalink to this headline">¶</a></h1>
+<p>Usergrid provides developers with access to a flexible data store and
+enables you to quickly integrate valuable features into your app,
+including social graphs, user management, data storage, push
+notifications, performance monitoring, and more.</p>
+<p>With Usergrid, developers can set up their own cloud-based data platform
+in minutes instead of months – no server-side coding or back-end
+development needed. This allows your developers to focus on developing
+the rich features and user experience that truly differentiate your app,
+rather than on the time-consuming details of implementing core back-end
+services and infrastructure.</p>
+<div class="section" id="data-storage-management">
+<h2>Data storage &amp; management<a class="headerlink" href="#data-storage-management" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="application-data">
+<h3>Application data<a class="headerlink" href="#application-data" title="Permalink to this headline">¶</a></h3>
+<p>At the core of Usergrid is a flexible platform that can store any type
+of application data, from simple records like a catalog of books to
+complex associations like user relationships. No matter what type of
+data drives your app, you can store it as collections of data entities
+and immediately perform complex queries or full-text searches on any
+field. You can also create custom entities with custom properties,
+giving you the ability to store data and context in a way that makes
+sense for your app.</p>
+<p>To learn more about entities and collections, see Usergrid Data model.</p>
+<p>For a complete list of the default data entities available, see Default
+Data Entity Types.</p>
+</div>
+<div class="section" id="files-assets">
+<h3>Files &amp; assets<a class="headerlink" href="#files-assets" title="Permalink to this headline">¶</a></h3>
+<p>Images, video, and audio are key components of a great app experience.
+With Usergrid, you can upload and retrieve binary objects from the same
+data store as the rest of your application data, eliminating the need to
+set up content delivery networks (CDNs) and easing implementation. We
+handle all the back-end details that keep your content quickly
+accessible.</p>
+<p>To learn more about files and asset storage, see Uploading files and
+assets .</p>
+</div>
+</div>
+<div class="section" id="flexible-data-querying">
+<h2>Flexible data querying<a class="headerlink" href="#flexible-data-querying" title="Permalink to this headline">¶</a></h2>
+<p>One of Usergrid&#8217; most powerful features is the ability to perform
+SQL-style queries and full-text searches on data entities, as well as
+their properties. This lets you quickly retrieve specific data entities
+based on multiple criteria, then utilize that data to power social
+features, target push notifications, perform user analysis, and more.</p>
+<p>Learn more about querying app data, see Data query overview.</p>
+</div>
+<div class="section" id="social">
+<h2>Social<a class="headerlink" href="#social" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="entity-relationships">
+<h3>Entity relationships<a class="headerlink" href="#entity-relationships" title="Permalink to this headline">¶</a></h3>
+<p>You can create relationships between data entities to help build
+features, improve user experience, and contextualize data. For example,
+you might associate a user with their devices to capture valuable
+geolocation data, create relationships between users to build social
+graphs, or implement popular features such as activity streams.</p>
+<p>To learn more about entity relationships, see Entity connections.</p>
+</div>
+<div class="section" id="activity-streams">
+<h3>Activity streams<a class="headerlink" href="#activity-streams" title="Permalink to this headline">¶</a></h3>
+<p>A key aspect of social networking apps is the ability to provide and
+publish data streams of user actions, such as ongoing lists of comments,
+activities, and tweets. Usergrid simplifies management and routing of
+these data streams by providing an activity entity that is specifically
+designed to automatically create a relationship between activities and
+the user who created them.</p>
+<p>To learn more about activities and activity feeds, see Activity feeds.</p>
+</div>
+</div>
+<div class="section" id="user-management">
+<h2>User management<a class="headerlink" href="#user-management" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="registration-and-login">
+<h3>Registration and login<a class="headerlink" href="#registration-and-login" title="Permalink to this headline">¶</a></h3>
+<p>You can easily add and manage users by providing the core services
+necessary to handle secure registration and log in, including OAuth
+2.0-compliant client authentication. In addition, any number of default
+or custom data entities and properties can be associated with a user
+entity to create complete user profiles.</p>
+<p>To learn more about user management, see User.</p>
+<p>To learn more about authentication, see Authenticating users and
+application clients.</p>
+</div>
+<div class="section" id="roles-permissions">
+<h3>Roles &amp; permissions<a class="headerlink" href="#roles-permissions" title="Permalink to this headline">¶</a></h3>
+<p>Applications often require the ability to configure fine-grain control
+of user access to data, features and functionality. Usergrid solves the
+implementation details of user access with roles and permissions. Simply
+create roles that represent user types or access levels, such as
+Administrator, then assign the necessary permissions to that role. With
+a single API call, you can then associate your roles with any user or
+group of users.</p>
+<p>To learn more about user roles and permissions, see Managing access by
+defining permission rules.</p>
+</div>
+<div class="section" id="groups">
+<h3>Groups<a class="headerlink" href="#groups" title="Permalink to this headline">¶</a></h3>
+<p>Groups are a flexible way to organize your users based on any number of
+criteria. For example, you might group users based on interests or
+location to more effectively deliver relevant content, target offers, or
+customize campaigns. You can also take advantage of the groups entity to
+enable group-based social networking activities, such as allowing your
+users to create private information feeds or circles of friends.</p>
+<p>To learn more about groups, see Working with group data.</p>
+</div>
+<div class="section" id="third-party-authentication">
+<h3>Third-party authentication<a class="headerlink" href="#third-party-authentication" title="Permalink to this headline">¶</a></h3>
+<p>In addition to supporting user management and OAuth-based login for your
+app, Usergrid also makes it easy to integrate third-party authentication
+through such popular services as Facebook, Twitter and other
+OAuth-enabled accounts. Providing third-party sign-in can improve user
+experience, while increasing adoption, giving you access to valuable
+information from social networks and services.</p>
+<p>To learn more about using third-party sign-in, see Facebook sign in.</p>
+</div>
+</div>
+<div class="section" id="geolocation">
+<h2>Geolocation<a class="headerlink" href="#geolocation" title="Permalink to this headline">¶</a></h2>
+<p>The device entity allows you to capture geolocation data from your
+users&#8217; GPS-enabled devices to more effectively target campaigns, push
+notifications, offers and more. Geolocation also gives you an important
+data point for contextualizing and analyzing trends and user behavior.</p>
+<p>To learn more about geolocation, see Geolocation.</p>
+</div>
+<div class="section" id="push-notifications">
+<h2>Push notifications<a class="headerlink" href="#push-notifications" title="Permalink to this headline">¶</a></h2>
+<p>Push notifications are the most effective way to engage your users with
+relevant content, and thanks to Usergrid, implementing them can be done
+in minutes. Simply register your app and your user&#8217;s devices with a
+notification provider, such as Apple Push Notification Service or Google
+Cloud Messaging, then use the Usergrid notification entity to send
+millions of push notifications a month at no cost. When used in
+conjunction with queries of user and application data, push
+notifications become a powerful tool for leveraging user data, ensuring
+relevancy and driving engagement.</p>
+<p>To learn more about push notifications, see Push notifications overview.</p>
+</div>
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+      
+        <a href="data-model.html" class="btn btn-neutral float-right" title="Usergrid Data model" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+      
+      
+        <a href="../index.html" class="btn btn-neutral" title="Apache Usergrid Documentation" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+      
+    </div>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/objects.inv
----------------------------------------------------------------------
diff --git a/content/docs/objects.inv b/content/docs/objects.inv
new file mode 100644
index 0000000..aeca549
Binary files /dev/null and b/content/docs/objects.inv differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/orgs-and-apps/admin-user.html
----------------------------------------------------------------------
diff --git a/content/docs/orgs-and-apps/admin-user.html b/content/docs/orgs-and-apps/admin-user.html
new file mode 100644
index 0000000..6696baa
--- /dev/null
+++ b/content/docs/orgs-and-apps/admin-user.html
@@ -0,0 +1,780 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>Admin user$ &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>Admin user$</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/orgs-and-apps/admin-user.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="admin-user">
+<h1>Admin user$<a class="headerlink" href="#admin-user" title="Permalink to this headline">¶</a></h1>
+<p>An admin user has full access to perform any operation on all
+organization accounts of which the admin user is a member. Using the API
+Services BaaS API, you can create, update, or retrieve an admin user.
+You can also set or reset an admin user&#8217;s password, activite or
+reactivate an admin user, and get an admin user&#8217;s activity feed.</p>
+<p>In addition, you can add, retrieve, or remove an admin user from an
+organization. For information on these organization-related operations,
+see <a class="reference external" href="organization.html">Organization</a>.</p>
+<p><strong>Note</strong>: Although not shown in the API examples below, you need to
+provide a valid access token with each API call. See <a class="reference external" href="../security_and_auth/authenticating-users-and-application-clients.html">Authenticating
+users and application
+clients</a>
+for details.</p>
+<div class="section" id="creating-an-admin-user">
+<h2>Creating an admin user<a class="headerlink" href="#creating-an-admin-user" title="Permalink to this headline">¶</a></h2>
+<p>Use the POST method to create an admin user.</p>
+<div class="section" id="request-uri">
+<h3>Request URI<a class="headerlink" href="#request-uri" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>POST /management/organizations/{org}/users {request body}
+</pre></div>
+</div>
+<p>In the request body send a JSON object that represents the new user, for
+example:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+  <span class="s">&quot;username&quot;</span> <span class="p">:</span> <span class="s">&quot;jim.admin&quot;</span><span class="p">,</span>
+  <span class="s">&quot;email&quot;</span> <span class="p">:</span> <span class="s">&quot;jim.admin@gmail.com&quot;</span><span class="p">,</span>
+  <span class="s">&quot;name&quot;</span> <span class="p">:</span> <span class="s">&quot;Jim Admin&quot;</span><span class="p">,</span>
+  <span class="s">&quot;password&quot;</span> <span class="p">:</span> <span class="s">&quot;test12345&quot;</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="example-request">
+<h3>Example - Request<a class="headerlink" href="#example-request" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X -i POST &quot;https://api.usergrid.com/management/organizations/my-org/users&quot; -d &#39;{&quot;username&quot;:&quot;jim.admin&quot;,&quot;name&quot;:&quot;Jim Admin&quot;,&quot;email&quot;:&quot;jim.admin@gmail.com&quot;,&quot;password&quot;:&quot;test12345&quot;}&#39;
+</pre></div>
+</div>
+</div>
+<div class="section" id="example-response">
+<h3>Example - Response<a class="headerlink" href="#example-response" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>{
+  &quot;action&quot;: &quot;post&quot;,
+  &quot;status&quot;: &quot;ok&quot;,
+  &quot;data&quot;:  {
+    &quot;user&quot;:  {
+      &quot;applicationId&quot;: &quot;00000000-0000-0000-0000-000000000001&quot;,
+      &quot;username&quot;: &quot;jim.admin&quot;,
+      &quot;name&quot;: &quot;Jim Admin&quot;,
+      &quot;email&quot;: &quot;jim.admin@gmail.com&quot;,
+      &quot;activated&quot;: true,
+      &quot;disabled&quot;: false,
+      &quot;uuid&quot;: &quot;335b527f-cd0d-11e1-bef8-12331d1c5591&quot;,
+      &quot;adminUser&quot;: true,
+      &quot;displayEmailAddress&quot;: &quot;jim.admin &lt;jim.admin@gmail.com&gt;&quot;,
+      &quot;htmldisplayEmailAddress&quot;: &quot;jim.admin &lt;a href=&quot;mailto:jim.admin@gmail.com&quot;&gt;jinm.admin@gmail.com&lt;/a&gt;&quot;
+    }
+  },
+  &quot;timestamp&quot;: 1349390189106,
+  &quot;duration&quot;: 11808
+}
+</pre></div>
+</div>
+</div>
+</div>
+<div class="section" id="updating-an-admin-user">
+<h2>Updating an admin user<a class="headerlink" href="#updating-an-admin-user" title="Permalink to this headline">¶</a></h2>
+<p>Use the PUT method to update an admin user.</p>
+<div class="section" id="id1">
+<h3>Request URI<a class="headerlink" href="#id1" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>PUT /management/organizations/{org}/users/{user|username|email|uuid} {request body}
+</pre></div>
+</div>
+<p>Parameters</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="21%" />
+<col width="79%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>User identifier</td>
+<td>Username, name, email address, or UUID.</td>
+</tr>
+<tr class="row-odd"><td>request body</td>
+<td>JSON object containing propties you would like to add/update on user.</td>
+</tr>
+</tbody>
+</table>
+<p>For example, to add city and state to user, send this:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+  <span class="s">&quot;city&quot;</span> <span class="p">:</span> <span class="s">&quot;San Francisco&quot;</span><span class="p">,</span>
+  <span class="s">&quot;state&quot;</span> <span class="p">:</span> <span class="s">&quot;California&quot;</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="id2">
+<h3>Example - Request<a class="headerlink" href="#id2" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X -i PUT &quot;https://api.usergrid.com/management/organizations/my-org/users/jim.admin&quot; -d &#39;{&quot;city&quot;:&quot;San Francisco&quot;,&quot;state&quot;:&quot;California&quot;}&#39;
+</pre></div>
+</div>
+</div>
+<div class="section" id="id3">
+<h3>Example - Response<a class="headerlink" href="#id3" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+  <span class="s">&quot;action&quot;</span><span class="p">:</span> <span class="s">&quot;update user info&quot;</span><span class="p">,</span>
+  <span class="s">&quot;timestamp&quot;</span><span class="p">:</span> <span class="mi">1349479321874</span><span class="p">,</span>
+  <span class="s">&quot;duration&quot;</span><span class="p">:</span> <span class="mi">0</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+</div>
+<div class="section" id="getting-an-admin-user">
+<h2>Getting an admin user<a class="headerlink" href="#getting-an-admin-user" title="Permalink to this headline">¶</a></h2>
+<p>Use the GET method to retrieve details about an admin user.</p>
+<div class="section" id="id4">
+<h3>Request URI<a class="headerlink" href="#id4" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">GET</span> <span class="o">/</span><span class="n">management</span><span class="o">/</span><span class="n">organizations</span><span class="o">/</span><span class="p">{</span><span class="n">org</span><span class="p">}</span><span class="o">/</span><span class="n">users</span><span class="o">/</span><span class="p">{</span><span class="n">user</span><span class="o">|</span><span class="n">username</span><span class="o">|</span><span class="n">email</span><span class="o">|</span><span class="n">uuid</span><span class="p">}</span>
+</pre></div>
+</div>
+<p>Parameters</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="28%" />
+<col width="72%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>User identifier</td>
+<td>Admin username, name, email address, or UUID.</td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="section" id="id5">
+<h3>Example - Request<a class="headerlink" href="#id5" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X GET &quot;https://api.usergrid.com/management/organizations/my-org/users/jim.admin&quot;
+</pre></div>
+</div>
+</div>
+<div class="section" id="id6">
+<h3>Example - Response<a class="headerlink" href="#id6" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>{
+  &quot;action&quot;: &quot;get admin user&quot;,
+  &quot;status&quot;: &quot;ok&quot;,
+  &quot;data&quot;:  {
+    &quot;username&quot;: &quot;jim.admin&quot;,
+    &quot;token&quot;: &quot;YWMt4NqE8Q9GEeLYJhIxPSiO4AAAATo5fQfcG0cEd2h9nwmDmRorkNNrEeQyDOF&quot;,
+    &quot;email&quot;: &quot;edort1@gmail.com&quot;,
+    &quot;organizations&quot;:  {
+      &quot;jim.admin&quot;:  {
+        &quot;users&quot;:  {
+          &quot;jim.admin&quot;:  {
+            &quot;applicationId&quot;: &quot;00000000-0000-0000-0000-000000000001&quot;,
+            &quot;username&quot;: &quot;jim.admin&quot;,
+            &quot;name&quot;: &quot;Jim Admin&quot;,
+            &quot;email&quot;: &quot;jim.admin@gmail.com&quot;,
+            &quot;activated&quot;: true,
+            &quot;disabled&quot;: false,
+            &quot;uuid&quot;: &quot;328b526e-cd0c-11e1-bcf8-12424d1c4491&quot;,
+            &quot;adminUser&quot;: true,
+            &quot;displayEmailAddress&quot;: &quot;jim.admin &lt;jim.admin@gmail.com&gt;&quot;,
+            &quot;htmldisplayEmailAddress&quot;: &quot;jim.admin &lt;&lt;a href=&quot;mailto:jim.admin@gmail.com&quot;&gt;jim.admin@gmail.com&gt;&quot;
+    },
+    ...
+    &quot;adminUser&quot;: true,
+    &quot;activated&quot;: true,
+    &quot;name&quot;: &quot;edort1&quot;,
+    &quot;applicationId&quot;: &quot;00000000-0000-0000-0000-000000000001&quot;,
+    &quot;uuid&quot;: &quot;328b526e-cd0c-11e1-bcf8-12424d1c4491&quot;,
+    &quot;htmldisplayEmailAddress&quot;: &quot;jim.admin &lt;&lt;a href=&quot;mailto:jim.admin@gmail.com&quot;&gt;jim.admin@gmail.com&gt;&gt;&quot;,
+    &quot;displayEmailAddress&quot;: &quot;jim.admin &lt;jim.admin@gmail.com&gt;&quot;,
+    &quot;disabled&quot;: false
+  },
+  &quot;timestamp&quot;: 1349480786906
+}
+</pre></div>
+</div>
+</div>
+</div>
+<div class="section" id="setting-an-admin-user-s-password">
+<h2>Setting an admin user&#8217;s password<a class="headerlink" href="#setting-an-admin-user-s-password" title="Permalink to this headline">¶</a></h2>
+<p>Use the PUT method to update an admin user&#8217;s password.</p>
+<div class="section" id="id7">
+<h3>Request URI<a class="headerlink" href="#id7" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>PUT /management/users/{user|username|email|uuid}/password {request body}
+</pre></div>
+</div>
+<p>Parameters</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="28%" />
+<col width="72%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>User identifier</td>
+<td>Admin username, name, email address, or UUID.</td>
+</tr>
+</tbody>
+</table>
+<p>Expects new and old password to be sent in request body:</p>
+<div class="highlight-python"><div class="highlight"><pre>{
+  &quot;password&quot;: &lt;old_password&gt;
+  &quot;newpassword&quot;:&lt;new_password&gt;
+}
+</pre></div>
+</div>
+</div>
+<div class="section" id="id8">
+<h3>Example - Request<a class="headerlink" href="#id8" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X -i PUT &quot;https://api.usergrid.com/management/users/jim.admin/password&quot; -d &#39;{&quot;oldpassword&quot;:&quot;test123&quot;, &quot;newpassword&quot;:&quot;mynewpassword&quot;}&#39;
+</pre></div>
+</div>
+</div>
+<div class="section" id="id9">
+<h3>Example - Response<a class="headerlink" href="#id9" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+  <span class="s">&quot;action&quot;</span><span class="p">:</span> <span class="s">&quot;set user password&quot;</span><span class="p">,</span>
+  <span class="s">&quot;timestamp&quot;</span><span class="p">:</span> <span class="mi">1349714010142</span><span class="p">,</span>
+  <span class="s">&quot;duration&quot;</span><span class="p">:</span> <span class="mi">0</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+</div>
+<div class="section" id="resetting-an-admin-user-s-password">
+<h2>Resetting an admin user&#8217;s password<a class="headerlink" href="#resetting-an-admin-user-s-password" title="Permalink to this headline">¶</a></h2>
+<p>Resetting an admin user&#8217;s password is a two step process. In the first
+step, you initiate the password reset. This returns a browser page. The
+page includes a field for the user to enter his or her email address,
+and a field to enter a response to a Captcha challenge. In the second
+step, you handle the user&#8217;s responses from the form.</p>
+<div class="section" id="initiating-a-password-reset">
+<h3>Initiating a password reset<a class="headerlink" href="#initiating-a-password-reset" title="Permalink to this headline">¶</a></h3>
+<p>Use the GET method to initiate the password reset.</p>
+</div>
+<div class="section" id="id10">
+<h3>Request URI<a class="headerlink" href="#id10" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">GET</span> <span class="o">/</span><span class="n">management</span><span class="o">/</span><span class="n">organizations</span><span class="o">/</span><span class="p">{</span><span class="n">org</span><span class="p">}</span><span class="o">/</span><span class="n">users</span><span class="o">/</span><span class="n">resetpw</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="id11">
+<h3>Example - Request<a class="headerlink" href="#id11" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X GET &quot;https://api.usergrid.com/management/organizations/my-org/users/resetpw&quot;
+</pre></div>
+</div>
+</div>
+<div class="section" id="id12">
+<h3>Example - Response<a class="headerlink" href="#id12" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>&lt;!DOCTYPE html PUBLIC &quot;-//W3C//DTD HTML 4.01 Transitional//EN&quot; &quot;http://www.w3.org/TR/html4/loose.dtd&quot;&gt;
+&lt;html&gt;
+&lt;head&gt;
+    &lt;meta http-equiv=&quot;Content-Type&quot; content=&quot;text/html; charset=ISO-8859-1&quot;&gt;
+    &lt;title&gt;Reset Password&lt;/title&gt;
+    &lt;link rel=&quot;stylesheet&quot; type=&quot;text/css&quot; href=&quot;../../css/styles.css&quot; /&gt;
+    &lt;script type=&quot;text/javascript&quot;&gt;&gt;
+        var RecaptchaOptions = {
+            theme : &#39;clean&#39;
+        };
+    &lt;/script&gt;
+&lt;/head&gt;
+&lt;body&gt;
+
+    &lt;div class=&quot;dialog-area&quot;&gt;
+        &lt;div class=&quot;dialog-form-message&quot;&gt;Incorrect Captcha, try again...&lt;/div&gt;
+        &lt;form class=&quot;dialog-form&quot; action=&quot;&quot; method=&quot;post&quot;&gt;
+            &lt;fieldset&gt;
+                &lt;p&gt;
+                    &lt;label for=&quot;email&quot;&gt;Please type your &lt;strong&gt;email
+                            address&lt;/strong&gt; or &lt;strong&gt;username&lt;/strong&gt; below.&lt;/label&gt;
+                &lt;/p&gt;
+                &lt;p&gt;
+                    &lt;input class=&quot;text_field&quot; id=&quot;email&quot; name=&quot;email&quot; type=&quot;text&quot; /&gt;
+                &lt;/p&gt;
+                &lt;p id=&quot;human-proof&quot;&gt;&lt;/p&gt;
+                &lt;script type=&quot;text/javascript&quot; src=&quot;https://www.google.com/recaptcha/api/challenge?k=6LdSTNESAAAAAKHdVglHmMu86_EoYxsJjqQD1IpZ&quot;&gt;&lt;/script&gt;
+
+                &lt;p class=&quot;buttons&quot;&gt;
+                    &lt;button type=&quot;submit&quot;&gt;Submit&lt;/button&gt;
+                &lt;/p&gt;
+            &lt;/fieldset&gt;
+        &lt;/form&gt;
+    &lt;/div&gt;
+&lt;/pre&gt;
+</pre></div>
+</div>
+</div>
+</div>
+<div class="section" id="completing-a-password-reset">
+<h2>Completing a password reset<a class="headerlink" href="#completing-a-password-reset" title="Permalink to this headline">¶</a></h2>
+<p>Use the POST method to complete the password reset.</p>
+<div class="section" id="id13">
+<h3>Request URI<a class="headerlink" href="#id13" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>POST /management/organizations/{org}/users/resetpw {request body}
+</pre></div>
+</div>
+<p>In the request body send parameters and value for the Captcha challenge,
+the admin user&#8217;s response to the Captcha challenge, and the admin user&#8217;s
+email address, for example:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+  <span class="s">&quot;recaptcha_response_field&quot;</span> <span class="p">:</span> <span class="s">&quot;Atistophanes tseFia&quot;</span><span class="p">,</span>
+  <span class="s">&quot;recaptcha_challenge_field&quot;</span> <span class="p">:</span> <span class="s">&quot;Atistophanes tseFia&quot;</span><span class="p">,</span>
+  <span class="s">&quot;email&quot;</span> <span class="p">:</span> <span class="s">&quot;jim.admin@gmail.com&quot;</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="id14">
+<h3>Example - Request<a class="headerlink" href="#id14" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X -i POST &quot;https://api.usergrid.com/management/organizations/my-org/users/resetpw&quot; -d &#39;{&quot;recaptcha_response_field&quot;:&quot;Atistophanes tseFia&quot;,&quot;recaptcha_challenge_field&quot;:&quot;Atistophanes tseFia&quot;,&quot;email&quot;:&quot;jim.admin@gmail.com&quot;}&#39;
+</pre></div>
+</div>
+</div>
+<div class="section" id="id15">
+<h3>Example - Response<a class="headerlink" href="#id15" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+  <span class="s">&quot;action&quot;</span><span class="p">:</span> <span class="s">&quot;reset user password&quot;</span><span class="p">,</span>
+  <span class="s">&quot;timestamp&quot;</span><span class="p">:</span> <span class="mi">13546154010321</span><span class="p">,</span>
+  <span class="s">&quot;duration&quot;</span><span class="p">:</span> <span class="mi">0</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+</div>
+<div class="section" id="activating-an-admin-user">
+<h2>Activating an admin user<a class="headerlink" href="#activating-an-admin-user" title="Permalink to this headline">¶</a></h2>
+<p>Use the GET method to activate an admin user from a link provided in an
+email notification.</p>
+<div class="section" id="id16">
+<h3>Request URI<a class="headerlink" href="#id16" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>GET /management/organizations/{org}/users/{user|username|email|uuid}/activate?token={token}&amp;confirm={confirm_email}
+</pre></div>
+</div>
+<p>Parameters</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="27%" />
+<col width="73%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>User identifier</td>
+<td>Admin username, name, email address, or UUID.</td>
+</tr>
+<tr class="row-odd"><td>string token</td>
+<td>Activation token (supplied via email).</td>
+</tr>
+<tr class="row-even"><td>confirm_email</td>
+<td>Send confirmation email (false is the default).</td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="section" id="id17">
+<h3>Example - Request<a class="headerlink" href="#id17" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X GET &quot;https://api.usergrid.com/management/organizations/my-org/users/jim.admin/activate?token=33dd0563-cd0c-11e1-bcf7-12313d1c4491&quot;
+</pre></div>
+</div>
+</div>
+<div class="section" id="id18">
+<h3>Example - Response<a class="headerlink" href="#id18" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+  <span class="s">&quot;action&quot;</span><span class="p">:</span> <span class="s">&quot;activate user&quot;</span><span class="p">,</span>
+  <span class="s">&quot;timestamp&quot;</span><span class="p">:</span> <span class="mi">1349718021324</span><span class="p">,</span>
+  <span class="s">&quot;duration&quot;</span><span class="p">:</span> <span class="mi">0</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+</div>
+<div class="section" id="reactivating-an-admin-user">
+<h2>Reactivating an admin user<a class="headerlink" href="#reactivating-an-admin-user" title="Permalink to this headline">¶</a></h2>
+<p>Use the GET method to reactivate an admin user.</p>
+<div class="section" id="id19">
+<h3>Request URI<a class="headerlink" href="#id19" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">GET</span> <span class="o">/</span><span class="n">management</span><span class="o">/</span><span class="n">organizations</span><span class="o">/</span><span class="p">{</span><span class="n">org</span><span class="p">}</span><span class="o">/</span><span class="n">users</span><span class="o">/</span><span class="p">{</span><span class="n">user</span><span class="o">|</span><span class="n">username</span><span class="o">|</span><span class="n">email</span><span class="o">|</span><span class="n">uuid</span><span class="p">}</span><span class="o">/</span><span class="n">reactivate</span>
+</pre></div>
+</div>
+<p>Parameters</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="28%" />
+<col width="72%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>User identifier</td>
+<td>Admin username, name, email address, or UUID.</td>
+</tr>
+</tbody>
+</table>
+</div>
+</div>
+<div class="section" id="id20">
+<h2>Example - Request<a class="headerlink" href="#id20" title="Permalink to this headline">¶</a></h2>
+<div class="highlight-python"><div class="highlight"><pre>curl -X GET &quot;https://api.usergrid.com/management/organizations/my-org/users/jim.admin/reactivate&quot;
+</pre></div>
+</div>
+<div class="section" id="id21">
+<h3>Example - Response<a class="headerlink" href="#id21" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+  <span class="s">&quot;action&quot;</span><span class="p">:</span> <span class="s">&quot;reactivate user&quot;</span><span class="p">,</span>
+  <span class="s">&quot;timestamp&quot;</span><span class="p">:</span> <span class="mi">1349735217217</span><span class="p">,</span>
+  <span class="s">&quot;duration&quot;</span><span class="p">:</span> <span class="mi">3541</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+</div>
+<div class="section" id="getting-an-admin-user-s-activity-feed">
+<h2>Getting an admin user&#8217;s activity feed<a class="headerlink" href="#getting-an-admin-user-s-activity-feed" title="Permalink to this headline">¶</a></h2>
+<p>Use the GET method to retrieve an admin user&#8217;s activity feed.</p>
+<div class="section" id="id22">
+<h3>Request URI<a class="headerlink" href="#id22" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">GET</span> <span class="o">/</span><span class="n">management</span><span class="o">/</span><span class="n">organizations</span><span class="o">/</span><span class="p">{</span><span class="n">org</span><span class="p">}</span><span class="o">/</span><span class="n">users</span><span class="o">/</span><span class="p">{</span><span class="n">user</span><span class="o">|</span><span class="n">username</span><span class="o">|</span><span class="n">email</span><span class="o">|</span><span class="n">uuid</span><span class="p">}</span><span class="o">/</span><span class="n">feed</span>
+</pre></div>
+</div>
+<p>Parameters</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="28%" />
+<col width="72%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>User identifier</td>
+<td>Admin username, name, email address, or UUID.</td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="section" id="id23">
+<h3>Example - Request<a class="headerlink" href="#id23" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X GET &quot;https://api.usergrid.com/management/organizations/my-org/users/jim.admin/feed&quot;
+</pre></div>
+</div>
+</div>
+<div class="section" id="id24">
+<h3>Example - Response<a class="headerlink" href="#id24" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>{
+  &quot;action&quot;: &quot;get admin user feed&quot;,
+  &quot;status&quot;: &quot;ok&quot;,
+ &quot;entities&quot;:  [
+     {
+      &quot;uuid&quot;: &quot;cf3e981c-fe80-11e1-95c8-12331b144c65&quot;,
+      &quot;type&quot;: &quot;activity&quot;,
+      &quot;created&quot;: 1347643370454,
+      &quot;modified&quot;: 1347643370454,
+      &quot;actor&quot;:  {
+        &quot;displayName&quot;: &quot;jim.admin&quot;,
+        &quot;objectType&quot;: &quot;person&quot;,
+        &quot;uuid&quot;: &quot;335b527f-cd0d-11e1-bef8-12331d1c5591&quot;,
+        &quot;entityType&quot;: &quot;user&quot;
+      },
+      &quot;category&quot;: &quot;admin&quot;,
+      &quot;metadata&quot;:  {
+        &quot;cursor&quot;: &quot;gGkAAQMAgGkABgE5xc3r1gCAdQAQz02YHP6QEeGVyBIxOxIsVgCAdQAQz4ZbYf6QEeGVyBIxOxIsVgA&quot;,
+        &quot;path&quot;: &quot;/users/327b527f-cd0c-11e1-bcf7-12313d1c4491/feed/cf4d981c-fe90-11e1-95c8-12313b122c56&quot;
+      },
+    &quot;object&quot;:  {
+    ...
+    },
+    &quot;published&quot;: 1342198809251,
+            &quot;title&quot;: &quot;&lt;a mailto=&quot;jim.admingmail.com&quot;&gt;jim.admin (jim.admin@gmail.com)&lt;/a&gt; created a new organization account named jim.admin&quot;,
+            &quot;verb&quot;: &quot;create&quot;
+          }
+        ],
+  &quot;timestamp&quot;: 1349735719320,
+}
+</pre></div>
+</div>
+</div>
+</div>
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

[52/60] [abbrv] incubator-usergrid git commit: Minor refactoring in API doc generation.

[sn...@apache.org]

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/cbd78b6a/docs/rest-endpoints/api-docs.md
----------------------------------------------------------------------
diff --git a/docs/rest-endpoints/api-docs.md b/docs/rest-endpoints/api-docs.md
index fa39d59..51f1909 100644
--- a/docs/rest-endpoints/api-docs.md
+++ b/docs/rest-endpoints/api-docs.md
@@ -1,5 +1,28 @@
+<h1>Usergrid API Reference</h1>
+    
+Methods are organized by tag. Follow the methods are the [Model Definitions](#models).
+
+<h2>Table of Contents</h2>
+
+* [Access-Tokens](#access-tokens)
+* [Activities](#activities)
+* [Admin-Users](#admin-users)
+* [App-Users](#app-users)
+* [Entities-Collections](#entities-collections)
+* [Events](#events)
+* [Groups](#groups)
+* [Organizations-Applications](#organizations-applications)
+* [Permissions-Roles](#permissions-roles)
+
+<br>
+<br>
+
+
 ## Methods
-### Access-Tokens Methods
+
+
+### Access-Tokens
+
 
 <h2 class="usergrid-POST-heading">POST /management/token</h2>
 
@@ -44,7 +67,9 @@ __default__
 * Description: Unexpected error.
 * Schema: [Error](#error)
     
-### Activities Methods
+
+### Activities
+
 
 <h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/groups/{groupId}/feed</h2>
 
@@ -125,7 +150,9 @@ __default__
 * Description: Unexpected error.
 * Schema: [Error](#error)
     
-### Admin-Users Methods
+
+### Admin-Users
+
 
 <h2 class="usergrid-GET-heading">GET /management/orgs/{orgId}/users</h2>
 
@@ -352,7 +379,9 @@ __default__
 * Description: Unexpected error.
 * Schema: [Error](#error)
     
-### App-Users Methods
+
+### App-Users
+
 
 <h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/users</h2>
 
@@ -511,7 +540,9 @@ __default__
 * Description: Unexpected error.
 * Schema: [Error](#error)
     
-### Entities-Collections Methods
+
+### Entities-Collections
+
 
 <h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/users/{userId}/{relation}</h2>
 
@@ -776,7 +807,9 @@ __default__
 * Description: Unexpected error.
 * Schema: [Error](#error)
     
-### Events Methods
+
+### Events
+
 
 <h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/events</h2>
 
@@ -803,7 +836,9 @@ __default__
 * Description: Unexpected error.
 * Schema: [Error](#error)
     
-### Groups Methods
+
+### Groups
+
 
 <h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/groups</h2>
 
@@ -966,7 +1001,9 @@ __default__
 * Description: Unexpected error.
 * Schema: [Error](#error)
     
-### Organizations-Applications Methods
+
+### Organizations-Applications
+
 
 <h2 class="usergrid-POST-heading">POST /management/orgs</h2>
 
@@ -1217,7 +1254,9 @@ __default__
 * Description: Unexpected error.
 * Schema: [Error](#error)
     
-### Permissions-Roles Methods
+
+### Permissions-Roles
+
 
 <h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/roles</h2>
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/cbd78b6a/docs/src/main/groovy/usergrid/ApiDocGenerator.groovy
----------------------------------------------------------------------
diff --git a/docs/src/main/groovy/usergrid/ApiDocGenerator.groovy b/docs/src/main/groovy/usergrid/ApiDocGenerator.groovy
index 4952ebf..efc99e9 100644
--- a/docs/src/main/groovy/usergrid/ApiDocGenerator.groovy
+++ b/docs/src/main/groovy/usergrid/ApiDocGenerator.groovy
@@ -17,6 +17,9 @@ import com.github.mustachejava.*
 import org.apache.commons.lang3.RandomStringUtils;
 
 
+/**
+ * Generates Usergrid API docs from Swagger in Markdown format.
+ */
 public class ApiDocGenerator {
     
     def parser = new SwaggerParser();
@@ -41,9 +44,11 @@ public class ApiDocGenerator {
     public ApiDocGenerator() {
         writer = new OutputStreamWriter(new FileOutputStream("rest-endpoints/api-docs.md"));
         operationTemplate = mf.compile(
-                new FileReader("${mustacheBase}/operation.mustache"), "operation");
+                new FileReader("${mustacheBase}/markdown/operation.mustache"), "operation");
         modelTemplate = mf.compile(
-                new FileReader("${mustacheBase}/model.mustache"), "model");
+                new FileReader("${mustacheBase}/markdown/model.mustache"), "model");
+        fileStartTemplate = mf.compile(
+                new FileReader("${mustacheBase}/markdown/file-start.mustache"), "file-start");
     }
     
     public static void main( String[] args ) {
@@ -207,15 +212,29 @@ public class ApiDocGenerator {
     }
     
     def generateFileStart() {
-        // no op
+        def scope = [:];
+        def tags = [];
+        allTags.each{ tag -> 
+            def atag = [:];
+            atag.name = tag;
+            atag.link = tag.toLowerCase();
+            tags.add(atag);
+        };
+        scope.tags = tags;
+        fileStartTemplate.execute(writer, scope);
+        writer.flush();
     }
     
     def generateMethodsSectionTitle() {
+        writer.println "";
         writer.println "## Methods";
+        writer.println "";
     }
     
     def generateMethodsTitle(String tag) {
-        writer.println "### ${tag} Methods";
+        writer.println "";
+        writer.println "### ${tag}";
+        writer.println "";
     }
     
     def generateModelsTitle() {
@@ -224,24 +243,28 @@ public class ApiDocGenerator {
     }
     
     def generateFileEnd() {
-        // no op
+        writer.println "";
+        writer.println "Generated from the Usergrid Swagger definition.";
+        writer.println ""; 
     }
 }
 
-
+/**
+ * Generates Usergrid API docs from Swagger in HTML format.
+ */
 class HtmlApiDocGenerator extends ApiDocGenerator {
     
     public HtmlApiDocGenerator() {
         writer = new OutputStreamWriter(
                 new FileOutputStream("rest-endpoints/api-docs.html"));
         operationTemplate = mf.compile(
-                new FileReader("${mustacheBase}/operation-html.mustache"), "operation");
+                new FileReader("${mustacheBase}/html/operation.mustache"), "operation");
         modelTemplate = mf.compile(
-                new FileReader("${mustacheBase}/model-html.mustache"), "operation");
+                new FileReader("${mustacheBase}/html/model.mustache"), "operation");
         fileStartTemplate = mf.compile(
-                new FileReader("${mustacheBase}/file-start-html.mustache"), "file-start");
+                new FileReader("${mustacheBase}/html/file-start.mustache"), "file-start");
         fileEndTemplate = mf.compile(
-                new FileReader("${mustacheBase}/file-end-html.mustache"), "file-end");
+                new FileReader("${mustacheBase}/html/file-end.mustache"), "file-end");
     }
 
     def generateFileStart() {

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/cbd78b6a/docs/src/main/resources/file-end-html.mustache
----------------------------------------------------------------------
diff --git a/docs/src/main/resources/file-end-html.mustache b/docs/src/main/resources/file-end-html.mustache
deleted file mode 100644
index 28d75b5..0000000
--- a/docs/src/main/resources/file-end-html.mustache
+++ /dev/null
@@ -1,13 +0,0 @@
-
-    </div>
-    <div class="col-md-1"></div>
-</div>
-
-<!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
-    
-<!-- Latest compiled and minified JavaScript -->
-<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"></script>
-
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/cbd78b6a/docs/src/main/resources/file-start-html.mustache
----------------------------------------------------------------------
diff --git a/docs/src/main/resources/file-start-html.mustache b/docs/src/main/resources/file-start-html.mustache
deleted file mode 100644
index 642bf42..0000000
--- a/docs/src/main/resources/file-start-html.mustache
+++ /dev/null
@@ -1,21 +0,0 @@
-<html>
-<head>
-    <title>{{title}}</title>
-    
-    <!-- Latest compiled and minified CSS -->
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css">
-    
-    <!-- Optional theme -->
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap-theme.min.css">
-
-    <link rel="stylesheet" href="api-docs.css">
-    
-</head>
-<body>
-
-<div class="row">
-    <div class="col-md-1"></div>
-    <div class="col-md-10">
-    
-    <h1>{{title}}</h1>
-    <p>Generated from Swagger.</p>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/cbd78b6a/docs/src/main/resources/html/file-end.mustache
----------------------------------------------------------------------
diff --git a/docs/src/main/resources/html/file-end.mustache b/docs/src/main/resources/html/file-end.mustache
new file mode 100644
index 0000000..28d75b5
--- /dev/null
+++ b/docs/src/main/resources/html/file-end.mustache
@@ -0,0 +1,13 @@
+
+    </div>
+    <div class="col-md-1"></div>
+</div>
+
+<!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
+    
+<!-- Latest compiled and minified JavaScript -->
+<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"></script>
+
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/cbd78b6a/docs/src/main/resources/html/file-start.mustache
----------------------------------------------------------------------
diff --git a/docs/src/main/resources/html/file-start.mustache b/docs/src/main/resources/html/file-start.mustache
new file mode 100644
index 0000000..642bf42
--- /dev/null
+++ b/docs/src/main/resources/html/file-start.mustache
@@ -0,0 +1,21 @@
+<html>
+<head>
+    <title>{{title}}</title>
+    
+    <!-- Latest compiled and minified CSS -->
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css">
+    
+    <!-- Optional theme -->
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap-theme.min.css">
+
+    <link rel="stylesheet" href="api-docs.css">
+    
+</head>
+<body>
+
+<div class="row">
+    <div class="col-md-1"></div>
+    <div class="col-md-10">
+    
+    <h1>{{title}}</h1>
+    <p>Generated from Swagger.</p>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/cbd78b6a/docs/src/main/resources/html/model.mustache
----------------------------------------------------------------------
diff --git a/docs/src/main/resources/html/model.mustache b/docs/src/main/resources/html/model.mustache
new file mode 100644
index 0000000..8672641
--- /dev/null
+++ b/docs/src/main/resources/html/model.mustache
@@ -0,0 +1,38 @@
+
+<div>
+    <a name="{{name}}"/>
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading">
+        <h2 class="panel-title model-heading">{{name}}
+            <a data-toggle="collapse" data-target="#collapse-{{modelid}}"
+               href="#collapse-{{modelid}}" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-{{modelid}}" class="panel-body collapse">
+        
+        <h3>Properties</h3>
+
+        <table width="80%" class="table table-striped">
+            <tr>
+                <th>Name</th>
+                <th>Type</th>
+                <th>Description</th>
+                <th>Required</th>
+            </tr>
+            {{#properties}}
+                <tr>
+                    <td>{{name}}</td>
+                    <td>{{type}}</td>
+                    <td>{{description}}</td>
+                    <td>{{required}}</td>
+                </tr>
+            {{/properties}}
+        </table>
+
+    </div>
+    
+</div>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/cbd78b6a/docs/src/main/resources/html/operation.mustache
----------------------------------------------------------------------
diff --git a/docs/src/main/resources/html/operation.mustache b/docs/src/main/resources/html/operation.mustache
new file mode 100644
index 0000000..6e15b1f
--- /dev/null
+++ b/docs/src/main/resources/html/operation.mustache
@@ -0,0 +1,43 @@
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading {{method}}">
+        <h2 class="panel-title {{method}}-heading">{{method}} {{url}} 
+            <a data-toggle="collapse" data-target="#collapse-{{opid}}"
+                href="#collapse-{{opid}}" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-{{opid}}" class="panel-body collapse">
+
+        <p>{{description}}</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+            {{#parameters}}
+                <li>
+                    <b>{{name}}</b> ({{#type}}{{type}}{{/type}}{{#schemaRef}}
+                    <a href="#{{schemaAnchor}}">{{schemaRef}}</a>{{/schemaRef}}) <br>
+                    {{description}} (Specified in {{in}}).
+                </li>
+            {{/parameters}}
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+            {{#responses}}
+                <li>
+                    <b>{{#status}}{{status}}{{/status}}{{^status}}Default{{/status}}</b>
+                    <ul>
+                        <li>Description: {{description}}</li>
+                        <li>Schema: [<a href="#{{schemaAnchor}}">{{schema}}</a>]</li>
+                    </ul>
+                </li>
+            {{/responses}}
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/cbd78b6a/docs/src/main/resources/markdown/file-start.mustache
----------------------------------------------------------------------
diff --git a/docs/src/main/resources/markdown/file-start.mustache b/docs/src/main/resources/markdown/file-start.mustache
new file mode 100644
index 0000000..a43daa7
--- /dev/null
+++ b/docs/src/main/resources/markdown/file-start.mustache
@@ -0,0 +1,13 @@
+<h1>Usergrid API Reference</h1>
+    
+Methods are organized by tag. Follow the methods are the [Model Definitions](#models).
+
+<h2>Table of Contents</h2>
+
+{{#tags}}
+* [{{name}}](#{{link}})
+{{/tags}}
+
+<br>
+<br>
+

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/cbd78b6a/docs/src/main/resources/markdown/model.mustache
----------------------------------------------------------------------
diff --git a/docs/src/main/resources/markdown/model.mustache b/docs/src/main/resources/markdown/model.mustache
new file mode 100644
index 0000000..b58788b
--- /dev/null
+++ b/docs/src/main/resources/markdown/model.mustache
@@ -0,0 +1,21 @@
+
+### {{name}}
+
+__Properties__ 
+
+<table width="80%" class="usergrid-table">
+    <tr>
+        <th>Name</th>
+        <th>Type</th>
+        <th>Description</th>
+        <th>Required</th>
+    </tr>
+    {{#properties}}
+    <tr>
+        <td>{{name}}</td>
+        <td>{{type}}</td>
+        <td>{{description}}</td>
+        <td>{{required}}</td>
+    </tr>
+    {{/properties}}
+</table>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/cbd78b6a/docs/src/main/resources/markdown/operation.mustache
----------------------------------------------------------------------
diff --git a/docs/src/main/resources/markdown/operation.mustache b/docs/src/main/resources/markdown/operation.mustache
new file mode 100644
index 0000000..cce0524
--- /dev/null
+++ b/docs/src/main/resources/markdown/operation.mustache
@@ -0,0 +1,21 @@
+
+<h2 class="usergrid-{{method}}-heading">{{method}} {{url}}</h2>
+
+{{description}}
+
+<h3>Parameters</h3>
+
+{{#parameters}}
+* __{{name}}__ ({{#type}}{{type}}{{/type}}{{#schemaRef}}[{{schemaRef}}](#{{schemaAnchor}}){{/schemaRef}})
+{{description}} (Specified in {{in}}).
+{{/parameters}}
+
+<h3>Responses</h3>
+
+{{#responses}}
+__{{#status}}{{status}}{{/status}}{{^status}}Default{{/status}}__
+
+* Description: {{description}}
+* Schema: [{{schema}}](#{{schemaAnchor}})
+    
+{{/responses}}

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/cbd78b6a/docs/src/main/resources/model-html.mustache
----------------------------------------------------------------------
diff --git a/docs/src/main/resources/model-html.mustache b/docs/src/main/resources/model-html.mustache
deleted file mode 100644
index 8672641..0000000
--- a/docs/src/main/resources/model-html.mustache
+++ /dev/null
@@ -1,38 +0,0 @@
-
-<div>
-    <a name="{{name}}"/>
-</div>
-
-<div class="panel panel-default">
-    
-    <div class="panel-heading">
-        <h2 class="panel-title model-heading">{{name}}
-            <a data-toggle="collapse" data-target="#collapse-{{modelid}}"
-               href="#collapse-{{modelid}}" class="collapsed collapse-button"> </a>
-        </h2>
-    </div>
-    
-    <div id="collapse-{{modelid}}" class="panel-body collapse">
-        
-        <h3>Properties</h3>
-
-        <table width="80%" class="table table-striped">
-            <tr>
-                <th>Name</th>
-                <th>Type</th>
-                <th>Description</th>
-                <th>Required</th>
-            </tr>
-            {{#properties}}
-                <tr>
-                    <td>{{name}}</td>
-                    <td>{{type}}</td>
-                    <td>{{description}}</td>
-                    <td>{{required}}</td>
-                </tr>
-            {{/properties}}
-        </table>
-
-    </div>
-    
-</div>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/cbd78b6a/docs/src/main/resources/model.mustache
----------------------------------------------------------------------
diff --git a/docs/src/main/resources/model.mustache b/docs/src/main/resources/model.mustache
deleted file mode 100644
index b58788b..0000000
--- a/docs/src/main/resources/model.mustache
+++ /dev/null
@@ -1,21 +0,0 @@
-
-### {{name}}
-
-__Properties__ 
-
-<table width="80%" class="usergrid-table">
-    <tr>
-        <th>Name</th>
-        <th>Type</th>
-        <th>Description</th>
-        <th>Required</th>
-    </tr>
-    {{#properties}}
-    <tr>
-        <td>{{name}}</td>
-        <td>{{type}}</td>
-        <td>{{description}}</td>
-        <td>{{required}}</td>
-    </tr>
-    {{/properties}}
-</table>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/cbd78b6a/docs/src/main/resources/operation-html.mustache
----------------------------------------------------------------------
diff --git a/docs/src/main/resources/operation-html.mustache b/docs/src/main/resources/operation-html.mustache
deleted file mode 100644
index 6e15b1f..0000000
--- a/docs/src/main/resources/operation-html.mustache
+++ /dev/null
@@ -1,43 +0,0 @@
-
-<div class="panel panel-default">
-    
-    <div class="panel-heading {{method}}">
-        <h2 class="panel-title {{method}}-heading">{{method}} {{url}} 
-            <a data-toggle="collapse" data-target="#collapse-{{opid}}"
-                href="#collapse-{{opid}}" class="collapsed collapse-button"> </a>
-        </h2>
-    </div>
-    
-    <div id="collapse-{{opid}}" class="panel-body collapse">
-
-        <p>{{description}}</p>
-
-        <h3>Parameters</h3>
-
-        <ul>
-            {{#parameters}}
-                <li>
-                    <b>{{name}}</b> ({{#type}}{{type}}{{/type}}{{#schemaRef}}
-                    <a href="#{{schemaAnchor}}">{{schemaRef}}</a>{{/schemaRef}}) <br>
-                    {{description}} (Specified in {{in}}).
-                </li>
-            {{/parameters}}
-        </ul>
-
-        <h3>Responses</h3>
-
-        <ul>
-            {{#responses}}
-                <li>
-                    <b>{{#status}}{{status}}{{/status}}{{^status}}Default{{/status}}</b>
-                    <ul>
-                        <li>Description: {{description}}</li>
-                        <li>Schema: [<a href="#{{schemaAnchor}}">{{schema}}</a>]</li>
-                    </ul>
-                </li>
-            {{/responses}}
-        </ul>     
-        
-    </div>
-    <!--<div class="panel-footer"></div>-->
-</div>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/cbd78b6a/docs/src/main/resources/operation.mustache
----------------------------------------------------------------------
diff --git a/docs/src/main/resources/operation.mustache b/docs/src/main/resources/operation.mustache
deleted file mode 100644
index cce0524..0000000
--- a/docs/src/main/resources/operation.mustache
+++ /dev/null
@@ -1,21 +0,0 @@
-
-<h2 class="usergrid-{{method}}-heading">{{method}} {{url}}</h2>
-
-{{description}}
-
-<h3>Parameters</h3>
-
-{{#parameters}}
-* __{{name}}__ ({{#type}}{{type}}{{/type}}{{#schemaRef}}[{{schemaRef}}](#{{schemaAnchor}}){{/schemaRef}})
-{{description}} (Specified in {{in}}).
-{{/parameters}}
-
-<h3>Responses</h3>
-
-{{#responses}}
-__{{#status}}{{status}}{{/status}}{{^status}}Default{{/status}}__
-
-* Description: {{description}}
-* Schema: [{{schema}}](#{{schemaAnchor}})
-    
-{{/responses}}

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/cbd78b6a/docs/update-api-docs.sh
----------------------------------------------------------------------
diff --git a/docs/update-api-docs.sh b/docs/update-api-docs.sh
index 0885773..d11db0b 100755
--- a/docs/update-api-docs.sh
+++ b/docs/update-api-docs.sh
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
 # Updating API Docs requires Mustache.java
-groovy src/main/groovy/ApiDocGenerator.groovy 
+groovy src/main/groovy/usergrid/ApiDocGenerator.groovy 

[19/60] [abbrv] incubator-usergrid git commit: cherry picking docs from master

[sn...@apache.org]

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/entity-connections/relationships.html
----------------------------------------------------------------------
diff --git a/content/docs/entity-connections/relationships.html b/content/docs/entity-connections/relationships.html
new file mode 100644
index 0000000..3b04ef5
--- /dev/null
+++ b/content/docs/entity-connections/relationships.html
@@ -0,0 +1,379 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>Relationships &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>Relationships</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/entity-connections/relationships.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="relationships">
+<h1>Relationships<a class="headerlink" href="#relationships" title="Permalink to this headline">¶</a></h1>
+<div class="section" id="creating-connections-between-entities">
+<h2>Creating connections between entities<a class="headerlink" href="#creating-connections-between-entities" title="Permalink to this headline">¶</a></h2>
+<p>One of the most useful features of Usergrid is the ability to create
+connections between entities. A simple example of this is the
+Twitter-like use of <em>following</em>, where one user forms a connection with
+another by subscribing to any tweets they post. <a class="reference external" href="/messagee-example">Messagee
+Example</a> walks you through an example of following
+other users in our sample app, <em>Messagee</em>. Here is the basic format:</p>
+<div class="highlight-python"><div class="highlight"><pre>POST https://api.usergrid.com/my-org/my-app/users/fred/following/users/barney
+</pre></div>
+</div>
+<p>This API call results in two users, Fred and Barney, linked with a
+connection where Fred is following Barney.</p>
+<p>If you create a <em>following</em> connection between two users, Apache
+Usergrid automatically creates a virtual connection called <em>followers</em>
+that mirrors the <em>following</em> connection. In other words, if you create a
+connection where Fred is following Barney, Apache Usergrid automatically
+creates a virtual connection where Fred is a follower of Barney.</p>
+<p>Note that there is no mirror connection established. Apache Usergrid
+only creates a mirror connection when you create a <em>following</em>
+connection. It does not create a mirror connection for other verbs such
+as likes.</p>
+<p>You can see all the users that Fred is following, in this case only
+Barney, by making the following API call:</p>
+<div class="highlight-python"><div class="highlight"><pre>GET https://api.usergrid.com/my-org/my-app/users/fred/following
+</pre></div>
+</div>
+<p>You can see all of barney’s followers, in this case only Fred, by making
+the following API call:</p>
+<div class="highlight-python"><div class="highlight"><pre>GET https://api.usergrid.com/my-org/my-app/users/barney/followers
+</pre></div>
+</div>
+<p>The <em>followers</em> connection is a virtual connection because you can’t use
+it to link two entities. In other words, you can’t make fred a follower
+of barney by using a <em>followers</em> connection. &nbsp;<strong>This is wrong:</strong></p>
+<div class="highlight-python"><div class="highlight"><pre>POST https://api.usergrid.com/my-org/my-app/users/barney/followers/users/fred
+</pre></div>
+</div>
+<p>To create a <em>following</em> connection with the users switched, so that
+Barney is following Fred, do this:</p>
+<div class="highlight-python"><div class="highlight"><pre>POST https://api.usergrid.com/my-org/my-app/users/barney/following/users/fred
+</pre></div>
+</div>
+<p>You can now see Fred’s followers (only Barney) by making the following
+call:</p>
+<div class="highlight-python"><div class="highlight"><pre>GET https://api.usergrid.com/my-org/my-app/users/fred/followers
+</pre></div>
+</div>
+</div>
+<div class="section" id="creating-other-connections">
+<h2>Creating other connections<a class="headerlink" href="#creating-other-connections" title="Permalink to this headline">¶</a></h2>
+<p>You can extend this connection structure to create connections using any
+&#8220;verb&#8221; that can link two entities. For example, you could use likes to
+denote a connection between a user and his dog. First, create a dogs
+collection:</p>
+<div class="highlight-python"><div class="highlight"><pre>POST https://api.usergrid.com/my-org/my-app/dogs
+</pre></div>
+</div>
+<p>Then populate this collection with a new dog named Dino:</p>
+<div class="highlight-python"><div class="highlight"><pre>POST https://api.usergrid.com/my-org/my-app/dogs {&quot;name&quot; : &quot;dino&quot;}
+</pre></div>
+</div>
+<p>Then create a likes connection between Fred and his dog Dino:</p>
+<div class="highlight-python"><div class="highlight"><pre>POST https://api.usergrid.com/my-org/my-app/users/fred/likes/dogs/dino
+</pre></div>
+</div>
+</div>
+<div class="section" id="getting-connections">
+<h2>Getting connections<a class="headerlink" href="#getting-connections" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="get-all-connections-for-an-entity">
+<h3>Get all connections for an entity<a class="headerlink" href="#get-all-connections-for-an-entity" title="Permalink to this headline">¶</a></h3>
+<p>To get a list that only contains the connections, do a GET on the
+connections sub-property of the entity:</p>
+<div class="highlight-python"><div class="highlight"><pre>GET https://api.usergrid.com/my-org/my-app/users/fred/connections
+</pre></div>
+</div>
+</div>
+<div class="section" id="get-information-on-a-specific-connection-type">
+<h3>Get information on a specific connection type<a class="headerlink" href="#get-information-on-a-specific-connection-type" title="Permalink to this headline">¶</a></h3>
+<p>To get a list of users who like Fred:</p>
+<div class="highlight-python"><div class="highlight"><pre>GET https://api.usergrid.com/my-org/my-app/users/fred/connecting/likes
+</pre></div>
+</div>
+<p>To get a list of all dogs that Fred likes:</p>
+<div class="highlight-python"><div class="highlight"><pre>GET https://api.usergrid.com/my-org/my-app/users/fred/likes/dog
+</pre></div>
+</div>
+</div>
+</div>
+<div class="section" id="deleting-a-connection">
+<h2>Deleting a connection<a class="headerlink" href="#deleting-a-connection" title="Permalink to this headline">¶</a></h2>
+<p>You can delete a connection in a way similar to creating one. Just
+replace the POST method with the DELETE method. For example, you can
+delete the connection between fred and barney with the following API
+call:</p>
+<div class="highlight-python"><div class="highlight"><pre>DELETE https://api.usergrid.com/my-org/my-app/users/fred/following/barney
+</pre></div>
+</div>
+</div>
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/entity-connections/retrieving-entities.html
----------------------------------------------------------------------
diff --git a/content/docs/entity-connections/retrieving-entities.html b/content/docs/entity-connections/retrieving-entities.html
new file mode 100644
index 0000000..bafe45f
--- /dev/null
+++ b/content/docs/entity-connections/retrieving-entities.html
@@ -0,0 +1,419 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>Retrieving connections &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+        <link rel="next" title="Disconnecting entities" href="disconnecting-entities.html"/>
+        <link rel="prev" title="Connecting entities" href="connecting-entities.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">Retrieving connections</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#request-syntax">Request syntax</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#retrieve-all-connected-entities">Retrieve all connected entities</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#retrieve-all-connecting-entities-by-type">Retrieve all connecting entities by type</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#retrieve-all-connecting-entities">Retrieve all connecting entities</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>Retrieving connections</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/entity-connections/retrieving-entities.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="retrieving-connections">
+<h1>Retrieving connections<a class="headerlink" href="#retrieving-connections" title="Permalink to this headline">¶</a></h1>
+<p>Viewing all of an entities connections To see all of the connection
+types associated with an entity, simply retrieve the entity.</p>
+<p>All of the connection types the entity has made to other entities will
+appear in the metadata.connections property.</p>
+<p>All of the connection types that other entities have made to the entity
+will appear in the metadata.connecting property.</p>
+<p>For user entities, following/followers connections can be accessed by
+sending a GET request to the URL in the collections.following and
+collections.followers properties.</p>
+<p>Retrieve connected entities by connection type To get a list of entities
+a specified entity has connected to with a specific connection type, do
+the following:</p>
+<div class="section" id="request-syntax">
+<h2>Request syntax<a class="headerlink" href="#request-syntax" title="Permalink to this headline">¶</a></h2>
+<div class="highlight-python"><div class="highlight"><pre>curl -X GET https://api.usergrid.com/&lt;org&gt;/&lt;app&gt;/&lt;collection&gt;/&lt;entity&gt;/&lt;relationship&gt;
+</pre></div>
+</div>
+<p>Parameters</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="15%" />
+<col width="85%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>org</td>
+<td>Organization UUID or organization name</td>
+</tr>
+<tr class="row-odd"><td>app</td>
+<td>Application UUID or application name</td>
+</tr>
+<tr class="row-even"><td>collection</td>
+<td>Name or UUID of the collection of the entity you want to retrieve the connections of.</td>
+</tr>
+<tr class="row-odd"><td>entity</td>
+<td>Name or UUID of the entity whose connections you want to retrieve</td>
+</tr>
+<tr class="row-even"><td>relationship</td>
+<td>The connection type you want to retrieve the entities for.</td>
+</tr>
+</tbody>
+</table>
+<p>For example, specifying a relationship of &#8216;likes&#8217; would return a list of
+all entities that have the &#8216;likes&#8217; connection with the specified entity.</p>
+<p>Example request</p>
+<div class="highlight-python"><div class="highlight"><pre>curl -X GET https://api.usergrid.com/your-org/your-app/users/Arthur/likes
+</pre></div>
+</div>
+<p>Example response</p>
+<p>Notice that the entities are returned as a JSON array in the entities
+property.</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+  <span class="s">&quot;action&quot;</span> <span class="p">:</span> <span class="s">&quot;get&quot;</span><span class="p">,</span>
+  <span class="s">&quot;application&quot;</span> <span class="p">:</span> <span class="s">&quot;dk88fh4r-a166-11e2-a7f7-02e81adcf3d0&quot;</span><span class="p">,</span>
+  <span class="s">&quot;params&quot;</span> <span class="p">:</span> <span class="p">{</span> <span class="p">},</span>
+  <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/58606d0a-cfed-11e3-a694-dbf5228024a7/likes&quot;</span><span class="p">,</span>
+  <span class="s">&quot;uri&quot;</span> <span class="p">:</span> <span class="s">&quot;https://api.usergrid.com/your-org/your-app/users/58606d0a-cfed-11e3-a694-dbf5228024a7/likes&quot;</span><span class="p">,</span>
+  <span class="s">&quot;entities&quot;</span> <span class="p">:</span> <span class="p">[</span> <span class="p">{</span>
+    <span class="s">&quot;uuid&quot;</span> <span class="p">:</span> <span class="s">&quot;5bcc47ca-cfed-11e3-8bde-a7e008061e10&quot;</span><span class="p">,</span>
+    <span class="s">&quot;type&quot;</span> <span class="p">:</span> <span class="s">&quot;user&quot;</span><span class="p">,</span>
+    <span class="s">&quot;created&quot;</span> <span class="p">:</span> <span class="mi">1398810410556</span><span class="p">,</span>
+    <span class="s">&quot;modified&quot;</span> <span class="p">:</span> <span class="mi">1398810410556</span><span class="p">,</span>
+    <span class="s">&quot;username&quot;</span> <span class="p">:</span> <span class="s">&quot;Ford&quot;</span><span class="p">,</span>
+    <span class="s">&quot;activated&quot;</span> <span class="p">:</span> <span class="n">true</span><span class="p">,</span>
+    <span class="s">&quot;metadata&quot;</span> <span class="p">:</span> <span class="p">{</span>
+      <span class="s">&quot;connecting&quot;</span> <span class="p">:</span> <span class="p">{</span>
+        <span class="s">&quot;likes&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/58606d0a-cfed-11e3-a694-dbf5228024a7/likes/5bcc47ca-cfed-11e3-8bde-a7e008061e10/connecting/likes&quot;</span>
+      <span class="p">},</span>
+      <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/58606d0a-cfed-11e3-a694-dbf5228024a7/likes/5bcc47ca-cfed-11e3-8bde-a7e008061e10&quot;</span><span class="p">,</span>
+      <span class="s">&quot;sets&quot;</span> <span class="p">:</span> <span class="p">{</span>
+        <span class="s">&quot;rolenames&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/58606d0a-cfed-11e3-a694-dbf5228024a7/likes/5bcc47ca-cfed-11e3-8bde-a7e008061e10/roles&quot;</span><span class="p">,</span>
+        <span class="s">&quot;permissions&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/58606d0a-cfed-11e3-a694-dbf5228024a7/likes/5bcc47ca-cfed-11e3-8bde-a7e008061e10/permissions&quot;</span>
+      <span class="p">},</span>
+      <span class="s">&quot;collections&quot;</span> <span class="p">:</span> <span class="p">{</span>
+        <span class="s">&quot;activities&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/58606d0a-cfed-11e3-a694-dbf5228024a7/likes/5bcc47ca-cfed-11e3-8bde-a7e008061e10/activities&quot;</span><span class="p">,</span>
+        <span class="s">&quot;devices&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/58606d0a-cfed-11e3-a694-dbf5228024a7/likes/5bcc47ca-cfed-11e3-8bde-a7e008061e10/devices&quot;</span><span class="p">,</span>
+        <span class="s">&quot;feed&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/58606d0a-cfed-11e3-a694-dbf5228024a7/likes/5bcc47ca-cfed-11e3-8bde-a7e008061e10/feed&quot;</span><span class="p">,</span>
+        <span class="s">&quot;groups&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/58606d0a-cfed-11e3-a694-dbf5228024a7/likes/5bcc47ca-cfed-11e3-8bde-a7e008061e10/groups&quot;</span><span class="p">,</span>
+        <span class="s">&quot;roles&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/58606d0a-cfed-11e3-a694-dbf5228024a7/likes/5bcc47ca-cfed-11e3-8bde-a7e008061e10/roles&quot;</span><span class="p">,</span>
+        <span class="s">&quot;following&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/58606d0a-cfed-11e3-a694-dbf5228024a7/likes/5bcc47ca-cfed-11e3-8bde-a7e008061e10/following&quot;</span><span class="p">,</span>
+        <span class="s">&quot;followers&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/58606d0a-cfed-11e3-a694-dbf5228024a7/likes/5bcc47ca-cfed-11e3-8bde-a7e008061e10/followers&quot;</span>
+      <span class="p">}</span>
+    <span class="p">}</span>
+  <span class="p">}</span> <span class="p">],</span>
+  <span class="s">&quot;timestamp&quot;</span> <span class="p">:</span> <span class="mi">1398884631067</span><span class="p">,</span>
+  <span class="s">&quot;duration&quot;</span> <span class="p">:</span> <span class="mi">41</span><span class="p">,</span>
+  <span class="s">&quot;organization&quot;</span> <span class="p">:</span> <span class="s">&quot;your-org&quot;</span><span class="p">,</span>
+  <span class="s">&quot;applicationName&quot;</span> <span class="p">:</span> <span class="s">&quot;your-app&quot;</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="retrieve-all-connected-entities">
+<h2>Retrieve all connected entities<a class="headerlink" href="#retrieve-all-connected-entities" title="Permalink to this headline">¶</a></h2>
+<p>To get a list of all the entities a specified entity has connected to,
+use the same method as shown above in Retrieve connected entities by
+connection type, and set the relationship to connections.</p>
+<p>All of the entities that have made a connection of that type to the
+specified entity will be returned in the entities property of the
+response.</p>
+</div>
+<div class="section" id="retrieve-all-connecting-entities-by-type">
+<h2>Retrieve all connecting entities by type<a class="headerlink" href="#retrieve-all-connecting-entities-by-type" title="Permalink to this headline">¶</a></h2>
+<p>To get a list of all the entities that have created a connection of a
+specific type to a specified entity, use the same method as shown above
+in Retrieve connected entities by connection type, and set the
+relationship to connecting/.</p>
+<p>All of the entities that have made a connection to the specified entity
+will be returned in the entities property of the response.</p>
+</div>
+<div class="section" id="retrieve-all-connecting-entities">
+<h2>Retrieve all connecting entities<a class="headerlink" href="#retrieve-all-connecting-entities" title="Permalink to this headline">¶</a></h2>
+<p>To get a list of all the entities that have connected to a specified
+entity, use the same method as shown above in Retrieve connected
+entities by connection type, and set the relationship to connecting.</p>
+<p>All of the entities that have made a connection to the specified entity
+will be returned in the entities property of the response.</p>
+</div>
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+      
+        <a href="disconnecting-entities.html" class="btn btn-neutral float-right" title="Disconnecting entities" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+      
+      
+        <a href="connecting-entities.html" class="btn btn-neutral" title="Connecting entities" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+      
+    </div>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/genindex.html
----------------------------------------------------------------------
diff --git a/content/docs/genindex.html b/content/docs/genindex.html
new file mode 100644
index 0000000..59ecb7c
--- /dev/null
+++ b/content/docs/genindex.html
@@ -0,0 +1,282 @@
+
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>Index &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="index.html"/> 
+
+  
+  <script src="_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="data-queries/query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="data-queries/operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="security-and-auth/app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="security-and-auth/authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="user-management/user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="asset-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="asset-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="index.html">Docs</a> &raquo;</li>
+      
+    <li></li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+
+<h1 id="index">Index</h1>
+
+<div class="genindex-jumpbox">
+ 
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'./',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="_static/jquery.js"></script>
+      <script type="text/javascript" src="_static/underscore.js"></script>
+      <script type="text/javascript" src="_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/geolocation/geolocation.html
----------------------------------------------------------------------
diff --git a/content/docs/geolocation/geolocation.html b/content/docs/geolocation/geolocation.html
new file mode 100644
index 0000000..ed574ae
--- /dev/null
+++ b/content/docs/geolocation/geolocation.html
@@ -0,0 +1,413 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>Geolocating your Entities &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+        <link rel="next" title="Uploading assets" href="../asset-and-files/uploading-assets.html"/>
+        <link rel="prev" title="App Example - Messagee" href="../user-management/messagee-example.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul class="current">
+<li class="toctree-l1 current"><a class="current reference internal" href="">Geolocating your Entities</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#saving-location-data-in-an-entity">Saving location data in an entity</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#querying-location-data">Querying location data</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#enrich-your-app-with-location-data">Enrich your app with location data</a></li>
+</ul>
+</li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>Geolocating your Entities</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/geolocation/geolocation.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="geolocating-your-entities">
+<h1>Geolocating your Entities<a class="headerlink" href="#geolocating-your-entities" title="Permalink to this headline">¶</a></h1>
+<p>Many of today&#8217;s apps are enhanced by the use of geolocation – wireless
+detection of the physical location of a remote device. These apps
+determine the user&#8217;s position and use this data to enhance user
+experience. For example, apps can capture the exact location where a
+picture was taken or determine what businesses stored in the database to
+return to the user based on their current location.</p>
+<p>API Services provides a standard format for storing geolocation
+information in any entity, as well as syntax for querying that data
+based on distance from a latitude/longitude point.</p>
+<div class="section" id="saving-location-data-in-an-entity">
+<h2>Saving location data in an entity<a class="headerlink" href="#saving-location-data-in-an-entity" title="Permalink to this headline">¶</a></h2>
+<p>In API Services, geolocation data is saved in the location property of
+an entity with latitude and longitude sub-properites in the following
+format:</p>
+<div class="highlight-python"><div class="highlight"><pre>&quot;location&quot;: {
+    &quot;latitude&quot;: &lt;latitude_coordinate&gt;,
+    &quot;longitude&quot;: &lt;longitude_coordinate&gt;
+}
+</pre></div>
+</div>
+<p>An entity&#8217;s geolocation can be specified when the entity is
+<a class="reference external" href="../data-storage/entities.html#creating-custom-data-entities">created</a>
+or added later by
+<a class="reference external" href="../data-storage/entities.html#updating-data-entities">updating</a> an
+existing entity.</p>
+<p>For example, the following entity describes a restaurant:</p>
+<div class="highlight-python"><div class="highlight"><pre>{
+    &quot;uuid&quot; : &quot;03ae956a-249f-11e3-9f80-d16344f5a0e1&quot;,
+    &quot;type&quot; : &quot;restaurant&quot;,
+    &quot;name&quot; : &quot;Rockadero&quot;,
+        &quot;location&quot;: {
+            &quot;latitude&quot;: 37.779632,
+            &quot;longitude&quot;: -122.395131
+        }
+    &quot;created&quot; : 1379975113142,
+    &quot;modified&quot; : 1379975113142,
+    &quot;metadata&quot; : {
+      &quot;path&quot; : &quot;/restaurants/03ae956a-249f-11e3-9f80-d16344f5a0e1&quot;
+}
+</pre></div>
+</div>
+</div>
+<div class="section" id="querying-location-data">
+<h2>Querying location data<a class="headerlink" href="#querying-location-data" title="Permalink to this headline">¶</a></h2>
+<p>Location-aware apps require the ability to return content and results
+based on the user&#8217;s current location. To easily enable this, API
+Services supports the following query parameter to retrieve entities
+within a specified distance of any geocoordinate based on its location
+property:</p>
+<div class="highlight-python"><div class="highlight"><pre>location within &lt;distance_in_meters&gt; of &lt;latitude&gt;, &lt;longitude&gt;
+</pre></div>
+</div>
+<p>The returned results are sorted from nearest to furthest. Entities with
+the same location are returned in the order they were created.</p>
+<p>The location parameter can be appended to any standard API Services
+query. For more information on how to query your API Services data, see
+Querying your data.</p>
+<p>For example, here is how you would find all the devices within 8,046
+meters (~10 miles) of the center of San Francisco:</p>
+<div class="highlight-python"><div class="highlight"><pre>curl -X GET https://api.usergrid.com/your-org/your-app/devices?ql=location within 8046 of 37.774989,-122.419413
+</pre></div>
+</div>
+</div>
+<div class="section" id="enrich-your-app-with-location-data">
+<h2>Enrich your app with location data<a class="headerlink" href="#enrich-your-app-with-location-data" title="Permalink to this headline">¶</a></h2>
+<p>Location-awareness has become a feature users expect in many types of
+mobile applications because of its ability to create a more personalized
+and relevant experience for each user. With this in mind, the
+geolocation feature in API Services was designed to work with many of
+the available <a class="reference external" href="../api-docs.html#models">default data entities</a> to
+allow app developers to easily integrate powerful in-app features that
+can increase user engagement.</p>
+<p>Here are just a few of the ways that saving location data to a data
+entity can improve an app:</p>
+<table class="usergrid-table">
+<tr>
+  <th><p>Entity</p>
+</th>
+  <th><p>Usage</p>
+</th>
+</tr>
+<tr>
+  <td><p>user</p>
+</td>
+  <td><p>Save the location of a user&#8217;s home as part of their profile in the
+<code class="docutils literal"><span class="pre">users</span></code> collection to suggest upcoming special events or activities
+located nearby, or to display advertisements that are relevant based on
+the user&#8217;s proximity to a business.</p>
+</td>
+</tr>
+<tr>
+  <td><p>device</p>
+</td>
+  <td><p>Periodically save the location data returned from a user&#8217;s device, then
+query the <code class="docutils literal"><span class="pre">devices</span></code> collection to send offers and alerts to user&#8217;s
+that are located near your business with a <a class="reference external" href="../push-notifications/push-notifications-overview">push
+notification</a>.</p>
+</td>
+</tr>
+<tr>
+  <td><p>activity</p>
+</td>
+  <td><p>Create stronger social connections by associating a user <code class="docutils literal"><span class="pre">activity</span></code>
+with the location where it occurred. The activity can then be displayed
+to nearby friends and family, or used to enrich the user&#8217;s activity
+stream.</p>
+</td>
+</tr>
+<tr>
+  <td><p>asset</p>
+</td>
+  <td><p>Save user photos with location data in the <code class="docutils literal"><span class="pre">asset</span> <span class="pre">collection</span></code> to allow
+users to retrieve and sort their memories based on when and where they
+happened.</p>
+</td>
+</tr>
+</table></div>
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+      
+        <a href="../asset-and-files/uploading-assets.html" class="btn btn-neutral float-right" title="Uploading assets" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+      
+      
+        <a href="../user-management/messagee-example.html" class="btn btn-neutral" title="App Example - Messagee" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+      
+    </div>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/geolocation/tbd.html
----------------------------------------------------------------------
diff --git a/content/docs/geolocation/tbd.html b/content/docs/geolocation/tbd.html
new file mode 100644
index 0000000..1e5a5c5
--- /dev/null
+++ b/content/docs/geolocation/tbd.html
@@ -0,0 +1,280 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>COMING SOON... &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>COMING SOON...</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/geolocation/tbd.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="coming-soon">
+<h1>COMING SOON...<a class="headerlink" href="#coming-soon" title="Permalink to this headline">¶</a></h1>
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

[28/60] [abbrv] incubator-usergrid git commit: cherry picking docs from master

[sn...@apache.org]

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_static/jquery.js
----------------------------------------------------------------------
diff --git a/content/docs/_static/jquery.js b/content/docs/_static/jquery.js
new file mode 100644
index 0000000..ab28a24
--- /dev/null
+++ b/content/docs/_static/jquery.js
@@ -0,0 +1,4 @@
+/*! jQuery v1.11.1 | (c) 2005, 2014 jQuery Foundation, Inc. | jquery.org/license */
+!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k={},l="1.11.1",m=function(a,b){return new m.fn.init(a,b)},n=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,o=/^-ms-/,p=/-([\da-z])/gi,q=function(a,b){return b.toUpperCase()};m.fn=m.prototype={jquery:l,constructor:m,selector:"",length:0,toArray:function(){return d.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var b=m.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return m.each(this,a,b)},map:function(a){return this.pushStack(m.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(this,argumen
 ts))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},m.extend=m.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||m.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(e=arguments[h]))for(d in e)a=g[d],c=e[d],g!==c&&(j&&c&&(m.isPlainObject(c)||(b=m.isArray(c)))?(b?(b=!1,f=a&&m.isArray(a)?a:[]):f=a&&m.isPlainObject(a)?a:{},g[d]=m.extend(j,f,c)):void 0!==c&&(g[d]=c));return g},m.extend({expando:"jQuery"+(l+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===m.type(a)},isArray:Array.isArray||function(a){return"array"===m.type(a)},isWindow:function(a){return null!=a&&a=
 =a.window},isNumeric:function(a){return!m.isArray(a)&&a-parseFloat(a)>=0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},isPlainObject:function(a){var b;if(!a||"object"!==m.type(a)||a.nodeType||m.isWindow(a))return!1;try{if(a.constructor&&!j.call(a,"constructor")&&!j.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}if(k.ownLast)for(b in a)return j.call(a,b);for(b in a);return void 0===b||j.call(a,b)},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?h[i.call(a)]||"object":typeof a},globalEval:function(b){b&&m.trim(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(o,"ms-").replace(p,q)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var d,e=0,f=a.length,g=r(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else for(e in a)if(d=b.apply(a[e],c),d===!1)break}else if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d
 ===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(n,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(r(Object(a))?m.merge(c,"string"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){var d;if(b){if(g)return g.call(b,a,c);for(d=b.length,c=c?0>c?Math.max(0,d+c):c:0;d>c;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,b){var c=+b.length,d=0,e=a.length;while(c>d)a[e++]=b[d++];if(c!==c)while(void 0!==b[d])a[e++]=b[d++];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,f=0,g=a.length,h=r(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return"string"==typeof b&&(f=a[b],b=a,a=f),m.isFunction(a)?(c=d.call(arguments,2),e=function(){return a.apply(b||this,c.concat(d.call(ar
 guments)))},e.guid=a.guid=a.guid||m.guid++,e):void 0},now:function(){return+new Date},support:k}),m.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object "+b+"]"]=b.toLowerCase()});function r(a){var b=a.length,c=m.type(a);return"function"===c||m.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var s=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+-new Date,v=a.document,w=0,x=0,y=gb(),z=gb(),A=gb(),B=function(a,b){return a===b&&(l=!0),0},C="undefined",D=1<<31,E={}.hasOwnProperty,F=[],G=F.pop,H=F.push,I=F.push,J=F.slice,K=F.indexOf||function(a){for(var b=0,c=this.length;c>b;b++)if(this[b]===a)return b;return-1},L="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",N="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",O=N.replace("w","w#"),P="\\["+M+"*("+N+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[
 ^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+O+"))|)"+M+"*\\]",Q=":("+N+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+P+")*)|.*)\\)|)",R=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),S=new RegExp("^"+M+"*,"+M+"*"),T=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=new RegExp("="+M+"*([^\\]'\"]*?)"+M+"*\\]","g"),V=new RegExp(Q),W=new RegExp("^"+O+"$"),X={ID:new RegExp("^#("+N+")"),CLASS:new RegExp("^\\.("+N+")"),TAG:new RegExp("^("+N.replace("w","w*")+")"),ATTR:new RegExp("^"+P),PSEUDO:new RegExp("^"+Q),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+L+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/^(?:input|select|textarea|button)$/i,Z=/^h\d$/i,$=/^[^{]+\{\s*\[native \w/,_=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ab=/[+~]/,
 bb=/'|\\/g,cb=new RegExp("\\\\([\\da-f]{1,6}"+M+"?|("+M+")|.)","ig"),db=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)};try{I.apply(F=J.call(v.childNodes),v.childNodes),F[v.childNodes.length].nodeType}catch(eb){I={apply:F.length?function(a,b){H.apply(a,J.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function fb(a,b,d,e){var f,h,j,k,l,o,r,s,w,x;if((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,d=d||[],!a||"string"!=typeof a)return d;if(1!==(k=b.nodeType)&&9!==k)return[];if(p&&!e){if(f=_.exec(a))if(j=f[1]){if(9===k){if(h=b.getElementById(j),!h||!h.parentNode)return d;if(h.id===j)return d.push(h),d}else if(b.ownerDocument&&(h=b.ownerDocument.getElementById(j))&&t(b,h)&&h.id===j)return d.push(h),d}else{if(f[2])return I.apply(d,b.getElementsByTagName(a)),d;if((j=f[3])&&c.getElementsByClassName&&b.getElementsByClassName)return I.apply(d,b.getElementsByClassName(j)),d}if(c.qsa&&
 (!q||!q.test(a))){if(s=r=u,w=b,x=9===k&&a,1===k&&"object"!==b.nodeName.toLowerCase()){o=g(a),(r=b.getAttribute("id"))?s=r.replace(bb,"\\$&"):b.setAttribute("id",s),s="[id='"+s+"'] ",l=o.length;while(l--)o[l]=s+qb(o[l]);w=ab.test(a)&&ob(b.parentNode)||b,x=o.join(",")}if(x)try{return I.apply(d,w.querySelectorAll(x)),d}catch(y){}finally{r||b.removeAttribute("id")}}}return i(a.replace(R,"$1"),b,d,e)}function gb(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function hb(a){return a[u]=!0,a}function ib(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function jb(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function kb(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||D)-(~a.sourceIndex||D);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function lb(a){return function(b){var c=b.nodeName.toLower
 Case();return"input"===c&&b.type===a}}function mb(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function nb(a){return hb(function(b){return b=+b,hb(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function ob(a){return a&&typeof a.getElementsByTagName!==C&&a}c=fb.support={},f=fb.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=fb.setDocument=function(a){var b,e=a?a.ownerDocument||a:v,g=e.defaultView;return e!==n&&9===e.nodeType&&e.documentElement?(n=e,o=e.documentElement,p=!f(e),g&&g!==g.top&&(g.addEventListener?g.addEventListener("unload",function(){m()},!1):g.attachEvent&&g.attachEvent("onunload",function(){m()})),c.attributes=ib(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ib(function(a){return a.appendChild(e.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassNam
 e=$.test(e.getElementsByClassName)&&ib(function(a){return a.innerHTML="<div class='a'></div><div class='a i'></div>",a.firstChild.className="i",2===a.getElementsByClassName("i").length}),c.getById=ib(function(a){return o.appendChild(a).id=u,!e.getElementsByName||!e.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if(typeof b.getElementById!==C&&p){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){var c=typeof a.getAttributeNode!==C&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return typeof b.getElementsByTagName!==C?b.getElementsByTagName(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a
 ,b){return typeof b.getElementsByClassName!==C&&p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=$.test(e.querySelectorAll))&&(ib(function(a){a.innerHTML="<select msallowclip=''><option selected=''></option></select>",a.querySelectorAll("[msallowclip^='']").length&&q.push("[*^$]="+M+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+M+"*(?:value|"+L+")"),a.querySelectorAll(":checked").length||q.push(":checked")}),ib(function(a){var b=e.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+M+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=$.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ib(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",Q)}),q=q.length&&new RegExp(q.join("
 |")),r=r.length&&new RegExp(r.join("|")),b=$.test(o.compareDocumentPosition),t=b||$.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===e||a.ownerDocument===v&&t(v,a)?-1:b===e||b.ownerDocument===v&&t(v,b)?1:k?K.call(k,a)-K.call(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,f=a.parentNode,g=b.parentNode,h=[a],i=[b];if(!f||!g)return a===e?-1:b===e?1:f?-1:g?1:k?K.call(k,a)-K.call(k,b):0;if(f===g)return kb(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)i.unshift(c);while(h[d]=
 ==i[d])d++;return d?kb(h[d],i[d]):h[d]===v?-1:i[d]===v?1:0},e):n},fb.matches=function(a,b){return fb(a,null,null,b)},fb.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(U,"='$1']"),!(!c.matchesSelector||!p||r&&r.test(b)||q&&q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return fb(b,n,null,[a]).length>0},fb.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},fb.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&E.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},fb.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},fb.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=
 null,a},e=fb.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=fb.selectors={cacheLength:50,createPseudo:hb,match:X,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(cb,db),a[3]=(a[3]||a[4]||a[5]||"").replace(cb,db),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||fb.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&fb.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return X.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&V.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.len
 gth)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(cb,db).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+M+")"+a+"("+M+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||typeof a.getAttribute!==C&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=fb.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowe
 rCase(),s=!i&&!h;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){k=q[u]||(q[u]={}),j=k[a]||[],n=j[0]===w&&j[1],m=j[0]===w&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[w,n,m];break}}else if(s&&(j=(b[u]||(b[u]={}))[a])&&j[0]===w)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(s&&((l[u]||(l[u]={}))[a]=[w,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||fb.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?hb(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=K.call(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:hb(function(a){var b=[],c=[],d=h(a.replace(R,"$1"));retu
 rn d[u]?hb(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),!c.pop()}}),has:hb(function(a){return function(b){return fb(a,b).length>0}}),contains:hb(function(a){return function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:hb(function(a){return W.test(a||"")||fb.error("unsupported lang: "+a),a=a.replace(cb,db).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"
 ===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Z.test(a.nodeName)},input:function(a){return Y.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:nb(function(){return[0]}),last:nb(function(a,b){return[b-1]}),eq:nb(function(a,b,c){return[0>c?c+b:c]}),even:nb(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:nb(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:nb(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:nb(function(a,b,c){for(var d=0>c?c+b:c;++d<b;)a.push(d);return a})}},d.pseudos.n
 th=d.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})d.pseudos[b]=lb(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=mb(b);function pb(){}pb.prototype=d.filters=d.pseudos,d.setFilters=new pb,g=fb.tokenize=function(a,b){var c,e,f,g,h,i,j,k=z[a+" "];if(k)return b?0:k.slice(0);h=a,i=[],j=d.preFilter;while(h){(!c||(e=S.exec(h)))&&(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=T.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(R," ")}),h=h.slice(c.length));for(g in d.filter)!(e=X[g].exec(h))||j[g]&&!(e=j[g](e))||(c=e.shift(),f.push({value:c,type:g,matches:e}),h=h.slice(c.length));if(!c)break}return b?h.length:h?fb.error(a):z(a,i).slice(0)};function qb(a){for(var b=0,c=a.length,d="";c>b;b++)d+=a[b].value;return d}function rb(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(
 b=b[d])if(1===b.nodeType||e){if(i=b[u]||(b[u]={}),(h=i[d])&&h[0]===w&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function sb(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function tb(a,b,c){for(var d=0,e=b.length;e>d;d++)fb(a,b[d],c);return c}function ub(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function vb(a,b,c,d,e,f){return d&&!d[u]&&(d=vb(d)),e&&!e[u]&&(e=vb(e,f)),hb(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||tb(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:ub(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=ub(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?K.call(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=ub(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):I.apply(g,r)})}fu
 nction wb(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=rb(function(a){return a===b},h,!0),l=rb(function(a){return K.call(b,a)>-1},h,!0),m=[function(a,c,d){return!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d))}];f>i;i++)if(c=d.relative[a[i].type])m=[rb(sb(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return vb(i>1&&sb(m),i>1&&qb(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(R,"$1"),c,e>i&&wb(a.slice(i,e)),f>e&&wb(a=a.slice(e)),f>e&&qb(a))}m.push(c)}return sb(m)}function xb(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,m,o,p=0,q="0",r=f&&[],s=[],t=j,u=f||e&&d.find.TAG("*",k),v=w+=null==t?1:Math.random()||.1,x=u.length;for(k&&(j=g!==n&&g);q!==x&&null!=(l=u[q]);q++){if(e&&l){m=0;while(o=a[m++])if(o(l,g,h)){i.push(l);break}k&&(w=v)}c&&((l=!o&&l)&&p--,f&&r.push(l))}if(p+=q,c&&q!==p){m=0;while(o=b[m++])o(r,s,g,h);if(f){if(p>0)while(q--)r[q]||s[
 q]||(s[q]=G.call(i));s=ub(s)}I.apply(i,s),k&&!f&&s.length>0&&p+b.length>1&&fb.uniqueSort(i)}return k&&(w=v,j=t),r};return c?hb(f):f}return h=fb.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=wb(b[c]),f[u]?d.push(f):e.push(f);f=A(a,xb(e,d)),f.selector=a}return f},i=fb.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(cb,db),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=X.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(cb,db),ab.test(j[0].type)&&ob(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&qb(j),!a)return I.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,ab.test(a)&&ob(b.parentNode)||b),e},c.sortStable=u.split("").sort
 (B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ib(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ib(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||jb("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ib(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||jb("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ib(function(a){return null==a.getAttribute("disabled")})||jb(L,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),fb}(a);m.find=s,m.expr=s.selectors,m.expr[":"]=m.expr.pseudos,m.unique=s.uniqueSort,m.text=s.getText,m.isXMLDoc=s.isXML,m.contains=s.contains;var t=m.expr.match.needsContext,u=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,v=/^.[^:#\[\.,]*$/;function w(a,b,c
 ){if(m.isFunction(b))return m.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return m.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(v.test(b))return m.filter(b,a,c);b=m.filter(b,a)}return m.grep(a,function(a){return m.inArray(a,b)>=0!==c})}m.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?m.find.matchesSelector(d,a)?[d]:[]:m.find.matches(a,m.grep(b,function(a){return 1===a.nodeType}))},m.fn.extend({find:function(a){var b,c=[],d=this,e=d.length;if("string"!=typeof a)return this.pushStack(m(a).filter(function(){for(b=0;e>b;b++)if(m.contains(d[b],this))return!0}));for(b=0;e>b;b++)m.find(a,d[b],c);return c=this.pushStack(e>1?m.unique(c):c),c.selector=this.selector?this.selector+" "+a:a,c},filter:function(a){return this.pushStack(w(this,a||[],!1))},not:function(a){return this.pushStack(w(this,a||[],!0))},is:function(a){return!!w(this,"string"==typeof a&&t.test(a)?m(a):a||[],!1).length}});var x,y=a.document,z=/^(
 ?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,A=m.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(c="<"===a.charAt(0)&&">"===a.charAt(a.length-1)&&a.length>=3?[null,a,null]:z.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||x).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof m?b[0]:b,m.merge(this,m.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:y,!0)),u.test(c[1])&&m.isPlainObject(b))for(c in b)m.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}if(d=y.getElementById(c[2]),d&&d.parentNode){if(d.id!==c[2])return x.find(a);this.length=1,this[0]=d}return this.context=y,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):m.isFunction(a)?"undefined"!=typeof x.ready?x.ready(a):a(m):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),m.makeArray(a,this))};A.prototype=m.fn,x=m(y);var B=/^(?:parents|prev(?:Until|All))/,C={children:!0,contents:!0,next:!0,prev:!0};m.extend({dir:function(a,b,c){var d=[],e=
 a[b];while(e&&9!==e.nodeType&&(void 0===c||1!==e.nodeType||!m(e).is(c)))1===e.nodeType&&d.push(e),e=e[b];return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),m.fn.extend({has:function(a){var b,c=m(a,this),d=c.length;return this.filter(function(){for(b=0;d>b;b++)if(m.contains(this,c[b]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=t.test(a)||"string"!=typeof a?m(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&m.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?m.unique(f):f)},index:function(a){return a?"string"==typeof a?m.inArray(this[0],m(a)):m.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(m.unique(m.merge(this.get(),m(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function
  D(a,b){do a=a[b];while(a&&1!==a.nodeType);return a}m.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return m.dir(a,"parentNode")},parentsUntil:function(a,b,c){return m.dir(a,"parentNode",c)},next:function(a){return D(a,"nextSibling")},prev:function(a){return D(a,"previousSibling")},nextAll:function(a){return m.dir(a,"nextSibling")},prevAll:function(a){return m.dir(a,"previousSibling")},nextUntil:function(a,b,c){return m.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return m.dir(a,"previousSibling",c)},siblings:function(a){return m.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return m.sibling(a.firstChild)},contents:function(a){return m.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:m.merge([],a.childNodes)}},function(a,b){m.fn[a]=function(c,d){var e=m.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=m.filter(d,e)),this.length>1&&(C[a]||(e=m.unique(e)),B.test(a)&&(e=e
 .reverse())),this.pushStack(e)}});var E=/\S+/g,F={};function G(a){var b=F[a]={};return m.each(a.match(E)||[],function(a,c){b[c]=!0}),b}m.Callbacks=function(a){a="string"==typeof a?F[a]||G(a):m.extend({},a);var b,c,d,e,f,g,h=[],i=!a.once&&[],j=function(l){for(c=a.memory&&l,d=!0,f=g||0,g=0,e=h.length,b=!0;h&&e>f;f++)if(h[f].apply(l[0],l[1])===!1&&a.stopOnFalse){c=!1;break}b=!1,h&&(i?i.length&&j(i.shift()):c?h=[]:k.disable())},k={add:function(){if(h){var d=h.length;!function f(b){m.each(b,function(b,c){var d=m.type(c);"function"===d?a.unique&&k.has(c)||h.push(c):c&&c.length&&"string"!==d&&f(c)})}(arguments),b?e=h.length:c&&(g=d,j(c))}return this},remove:function(){return h&&m.each(arguments,function(a,c){var d;while((d=m.inArray(c,h,d))>-1)h.splice(d,1),b&&(e>=d&&e--,f>=d&&f--)}),this},has:function(a){return a?m.inArray(a,h)>-1:!(!h||!h.length)},empty:function(){return h=[],e=0,this},disable:function(){return h=i=c=void 0,this},disabled:function(){return!h},lock:function(){return i=voi
 d 0,c||k.disable(),this},locked:function(){return!i},fireWith:function(a,c){return!h||d&&!i||(c=c||[],c=[a,c.slice?c.slice():c],b?i.push(c):j(c)),this},fire:function(){return k.fireWith(this,arguments),this},fired:function(){return!!d}};return k},m.extend({Deferred:function(a){var b=[["resolve","done",m.Callbacks("once memory"),"resolved"],["reject","fail",m.Callbacks("once memory"),"rejected"],["notify","progress",m.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return m.Deferred(function(c){m.each(b,function(b,f){var g=m.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&m.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?m.extend(a,d):d}},e={};return d.pipe=d.then,m.each(b,function(a,f){var g=
 f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=d.call(arguments),e=c.length,f=1!==e||a&&m.isFunction(a.promise)?e:0,g=1===f?a:m.Deferred(),h=function(a,b,c){return function(e){b[a]=this,c[a]=arguments.length>1?d.call(arguments):e,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(e>1)for(i=new Array(e),j=new Array(e),k=new Array(e);e>b;b++)c[b]&&m.isFunction(c[b].promise)?c[b].promise().done(h(b,k,c)).fail(g.reject).progress(h(b,j,i)):--f;return f||g.resolveWith(k,c),g.promise()}});var H;m.fn.ready=function(a){return m.ready.promise().done(a),this},m.extend({isReady:!1,readyWait:1,holdReady:function(a){a?m.readyWait++:m.ready(!0)},ready:function(a){if(a===!0?!--m.readyWait:!m.isReady){if(!y.body)return setTimeout(m.ready);m.isReady=!0,a!==!0&&--m.readyWait>0||(H.resolveWith(y,[m]),m
 .fn.triggerHandler&&(m(y).triggerHandler("ready"),m(y).off("ready")))}}});function I(){y.addEventListener?(y.removeEventListener("DOMContentLoaded",J,!1),a.removeEventListener("load",J,!1)):(y.detachEvent("onreadystatechange",J),a.detachEvent("onload",J))}function J(){(y.addEventListener||"load"===event.type||"complete"===y.readyState)&&(I(),m.ready())}m.ready.promise=function(b){if(!H)if(H=m.Deferred(),"complete"===y.readyState)setTimeout(m.ready);else if(y.addEventListener)y.addEventListener("DOMContentLoaded",J,!1),a.addEventListener("load",J,!1);else{y.attachEvent("onreadystatechange",J),a.attachEvent("onload",J);var c=!1;try{c=null==a.frameElement&&y.documentElement}catch(d){}c&&c.doScroll&&!function e(){if(!m.isReady){try{c.doScroll("left")}catch(a){return setTimeout(e,50)}I(),m.ready()}}()}return H.promise(b)};var K="undefined",L;for(L in m(k))break;k.ownLast="0"!==L,k.inlineBlockNeedsLayout=!1,m(function(){var a,b,c,d;c=y.getElementsByTagName("body")[0],c&&c.style&&(b=y.crea
 teElement("div"),d=y.createElement("div"),d.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(d).appendChild(b),typeof b.style.zoom!==K&&(b.style.cssText="display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1",k.inlineBlockNeedsLayout=a=3===b.offsetWidth,a&&(c.style.zoom=1)),c.removeChild(d))}),function(){var a=y.createElement("div");if(null==k.deleteExpando){k.deleteExpando=!0;try{delete a.test}catch(b){k.deleteExpando=!1}}a=null}(),m.acceptData=function(a){var b=m.noData[(a.nodeName+" ").toLowerCase()],c=+a.nodeType||1;return 1!==c&&9!==c?!1:!b||b!==!0&&a.getAttribute("classid")===b};var M=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,N=/([A-Z])/g;function O(a,b,c){if(void 0===c&&1===a.nodeType){var d="data-"+b.replace(N,"-$1").toLowerCase();if(c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:M.test(c)?m.parseJSON(c):c}catch(e){}m.data(a,b,c)}else c=void 0}return c}function P(a){var b;for(b
  in a)if(("data"!==b||!m.isEmptyObject(a[b]))&&"toJSON"!==b)return!1;return!0}function Q(a,b,d,e){if(m.acceptData(a)){var f,g,h=m.expando,i=a.nodeType,j=i?m.cache:a,k=i?a[h]:a[h]&&h;
+if(k&&j[k]&&(e||j[k].data)||void 0!==d||"string"!=typeof b)return k||(k=i?a[h]=c.pop()||m.guid++:h),j[k]||(j[k]=i?{}:{toJSON:m.noop}),("object"==typeof b||"function"==typeof b)&&(e?j[k]=m.extend(j[k],b):j[k].data=m.extend(j[k].data,b)),g=j[k],e||(g.data||(g.data={}),g=g.data),void 0!==d&&(g[m.camelCase(b)]=d),"string"==typeof b?(f=g[b],null==f&&(f=g[m.camelCase(b)])):f=g,f}}function R(a,b,c){if(m.acceptData(a)){var d,e,f=a.nodeType,g=f?m.cache:a,h=f?a[m.expando]:m.expando;if(g[h]){if(b&&(d=c?g[h]:g[h].data)){m.isArray(b)?b=b.concat(m.map(b,m.camelCase)):b in d?b=[b]:(b=m.camelCase(b),b=b in d?[b]:b.split(" ")),e=b.length;while(e--)delete d[b[e]];if(c?!P(d):!m.isEmptyObject(d))return}(c||(delete g[h].data,P(g[h])))&&(f?m.cleanData([a],!0):k.deleteExpando||g!=g.window?delete g[h]:g[h]=null)}}}m.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(a){return a=a.nodeType?m.cache[a[m.expando]]:a[m.expando],!!a&&!P(a)},
 data:function(a,b,c){return Q(a,b,c)},removeData:function(a,b){return R(a,b)},_data:function(a,b,c){return Q(a,b,c,!0)},_removeData:function(a,b){return R(a,b,!0)}}),m.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=m.data(f),1===f.nodeType&&!m._data(f,"parsedAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=m.camelCase(d.slice(5)),O(f,d,e[d])));m._data(f,"parsedAttrs",!0)}return e}return"object"==typeof a?this.each(function(){m.data(this,a)}):arguments.length>1?this.each(function(){m.data(this,a,b)}):f?O(f,a,m.data(f,a)):void 0},removeData:function(a){return this.each(function(){m.removeData(this,a)})}}),m.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=m._data(a,b),c&&(!d||m.isArray(c)?d=m._data(a,b,m.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=m.queue(a,b),d=c.length,e=c.shift(),f=m._queueHooks(a,b),g=function(){m.dequeue(a,b)};"inprogress"===e&&(
 e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return m._data(a,c)||m._data(a,c,{empty:m.Callbacks("once memory").add(function(){m._removeData(a,b+"queue"),m._removeData(a,c)})})}}),m.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?m.queue(this[0],a):void 0===b?this:this.each(function(){var c=m.queue(this,a,b);m._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&m.dequeue(this,a)})},dequeue:function(a){return this.each(function(){m.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=m.Deferred(),f=this,g=this.length,h=function(){--d||e.resolveWith(f,[f])};"string"!=typeof a&&(b=a,a=void 0),a=a||"fx";while(g--)c=m._data(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var S=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,T=["Top","Right","Botto
 m","Left"],U=function(a,b){return a=b||a,"none"===m.css(a,"display")||!m.contains(a.ownerDocument,a)},V=m.access=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===m.type(c)){e=!0;for(h in c)m.access(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,m.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(m(a),c)})),b))for(;i>h;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},W=/^(?:checkbox|radio)$/i;!function(){var a=y.createElement("input"),b=y.createElement("div"),c=y.createDocumentFragment();if(b.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",k.leadingWhitespace=3===b.firstChild.nodeType,k.tbody=!b.getElementsByTagName("tbody").length,k.htmlSerialize=!!b.getElementsByTagName("link").length,k.html5Clone="<:nav></:nav>"!==y.createElement("nav").cloneNode(!0).outerHTML,a.type="checkbox",a.checked=!0,c.appendChild(a),k.appendChecked=a.checked,b.innerHTML="<textarea>x</textarea>
 ",k.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue,c.appendChild(b),b.innerHTML="<input type='radio' checked='checked' name='t'/>",k.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,k.noCloneEvent=!0,b.attachEvent&&(b.attachEvent("onclick",function(){k.noCloneEvent=!1}),b.cloneNode(!0).click()),null==k.deleteExpando){k.deleteExpando=!0;try{delete b.test}catch(d){k.deleteExpando=!1}}}(),function(){var b,c,d=y.createElement("div");for(b in{submit:!0,change:!0,focusin:!0})c="on"+b,(k[b+"Bubbles"]=c in a)||(d.setAttribute(c,"t"),k[b+"Bubbles"]=d.attributes[c].expando===!1);d=null}();var X=/^(?:input|select|textarea)$/i,Y=/^key/,Z=/^(?:mouse|pointer|contextmenu)|click/,$=/^(?:focusinfocus|focusoutblur)$/,_=/^([^.]*)(?:\.(.+)|)$/;function ab(){return!0}function bb(){return!1}function cb(){try{return y.activeElement}catch(a){}}m.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,n,o,p,q,r=m._data(a);if(r){c.handler&&(i=c,c=i.handler,e=i.selector),c.guid||(c.guid=
 m.guid++),(g=r.events)||(g=r.events={}),(k=r.handle)||(k=r.handle=function(a){return typeof m===K||a&&m.event.triggered===a.type?void 0:m.event.dispatch.apply(k.elem,arguments)},k.elem=a),b=(b||"").match(E)||[""],h=b.length;while(h--)f=_.exec(b[h])||[],o=q=f[1],p=(f[2]||"").split(".").sort(),o&&(j=m.event.special[o]||{},o=(e?j.delegateType:j.bindType)||o,j=m.event.special[o]||{},l=m.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&m.expr.match.needsContext.test(e),namespace:p.join(".")},i),(n=g[o])||(n=g[o]=[],n.delegateCount=0,j.setup&&j.setup.call(a,d,p,k)!==!1||(a.addEventListener?a.addEventListener(o,k,!1):a.attachEvent&&a.attachEvent("on"+o,k))),j.add&&(j.add.call(a,l),l.handler.guid||(l.handler.guid=c.guid)),e?n.splice(n.delegateCount++,0,l):n.push(l),m.event.global[o]=!0);a=null}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,n,o,p,q,r=m.hasData(a)&&m._data(a);if(r&&(k=r.events)){b=(b||"").match(E)||[""],j=b.length;while(j--)if(h=_.exec(b[j])||
 [],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=m.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,n=k[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),i=f=n.length;while(f--)g=n[f],!e&&q!==g.origType||c&&c.guid!==g.guid||h&&!h.test(g.namespace)||d&&d!==g.selector&&("**"!==d||!g.selector)||(n.splice(f,1),g.selector&&n.delegateCount--,l.remove&&l.remove.call(a,g));i&&!n.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||m.removeEvent(a,o,r.handle),delete k[o])}else for(o in k)m.event.remove(a,o+b[j],c,d,!0);m.isEmptyObject(k)&&(delete r.handle,m._removeData(a,"events"))}},trigger:function(b,c,d,e){var f,g,h,i,k,l,n,o=[d||y],p=j.call(b,"type")?b.type:b,q=j.call(b,"namespace")?b.namespace.split("."):[];if(h=l=d=d||y,3!==d.nodeType&&8!==d.nodeType&&!$.test(p+m.event.triggered)&&(p.indexOf(".")>=0&&(q=p.split("."),p=q.shift(),q.sort()),g=p.indexOf(":")<0&&"on"+p,b=b[m.expando]?b:new m.Event(p,"object"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=q.join("
 ."),b.namespace_re=b.namespace?new RegExp("(^|\\.)"+q.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:m.makeArray(c,[b]),k=m.event.special[p]||{},e||!k.trigger||k.trigger.apply(d,c)!==!1)){if(!e&&!k.noBubble&&!m.isWindow(d)){for(i=k.delegateType||p,$.test(i+p)||(h=h.parentNode);h;h=h.parentNode)o.push(h),l=h;l===(d.ownerDocument||y)&&o.push(l.defaultView||l.parentWindow||a)}n=0;while((h=o[n++])&&!b.isPropagationStopped())b.type=n>1?i:k.bindType||p,f=(m._data(h,"events")||{})[b.type]&&m._data(h,"handle"),f&&f.apply(h,c),f=g&&h[g],f&&f.apply&&m.acceptData(h)&&(b.result=f.apply(h,c),b.result===!1&&b.preventDefault());if(b.type=p,!e&&!b.isDefaultPrevented()&&(!k._default||k._default.apply(o.pop(),c)===!1)&&m.acceptData(d)&&g&&d[p]&&!m.isWindow(d)){l=d[g],l&&(d[g]=null),m.event.triggered=p;try{d[p]()}catch(r){}m.event.triggered=void 0,l&&(d[g]=l)}return b.result}},dispatch:function(a){a=m.event.fix(a);var b,c,e,f,g,h=[],i=d.call(arguments),j=(m.
 _data(this,"events")||{})[a.type]||[],k=m.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=m.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,g=0;while((e=f.handlers[g++])&&!a.isImmediatePropagationStopped())(!a.namespace_re||a.namespace_re.test(e.namespace))&&(a.handleObj=e,a.data=e.data,c=((m.event.special[e.origType]||{}).handle||e.handler).apply(f.elem,i),void 0!==c&&(a.result=c)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&(!a.button||"click"!==a.type))for(;i!=this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(e=[],f=0;h>f;f++)d=b[f],c=d.selector+" ",void 0===e[c]&&(e[c]=d.needsContext?m(c,this).index(i)>=0:m.find(c,this,null,[i]).length),e[c]&&e.push(d);e.length&&g.push({elem:i,hand
 lers:e})}return h<b.length&&g.push({elem:this,handlers:b.slice(h)}),g},fix:function(a){if(a[m.expando])return a;var b,c,d,e=a.type,f=a,g=this.fixHooks[e];g||(this.fixHooks[e]=g=Z.test(e)?this.mouseHooks:Y.test(e)?this.keyHooks:{}),d=g.props?this.props.concat(g.props):this.props,a=new m.Event(f),b=d.length;while(b--)c=d[b],a[c]=f[c];return a.target||(a.target=f.srcElement||y),3===a.target.nodeType&&(a.target=a.target.parentNode),a.metaKey=!!a.metaKey,g.filter?g.filter(a,f):a},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){return null==a.which&&(a.which=null!=b.charCode?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,b){var c,d,e,f=b.button,g=b.fromElement;return null==a.pageX&&null!=b.cl
 ientX&&(d=a.target.ownerDocument||y,e=d.documentElement,c=d.body,a.pageX=b.clientX+(e&&e.scrollLeft||c&&c.scrollLeft||0)-(e&&e.clientLeft||c&&c.clientLeft||0),a.pageY=b.clientY+(e&&e.scrollTop||c&&c.scrollTop||0)-(e&&e.clientTop||c&&c.clientTop||0)),!a.relatedTarget&&g&&(a.relatedTarget=g===a.target?b.toElement:g),a.which||void 0===f||(a.which=1&f?1:2&f?3:4&f?2:0),a}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==cb()&&this.focus)try{return this.focus(),!1}catch(a){}},delegateType:"focusin"},blur:{trigger:function(){return this===cb()&&this.blur?(this.blur(),!1):void 0},delegateType:"focusout"},click:{trigger:function(){return m.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):void 0},_default:function(a){return m.nodeName(a.target,"a")}},beforeunload:{postDispatch:function(a){void 0!==a.result&&a.originalEvent&&(a.originalEvent.returnValue=a.result)}}},simulate:function(a,b,c,d){var e=m.extend(new m.Event,c,{type:a,isSimulated:!0,origin
 alEvent:{}});d?m.event.trigger(e,null,b):m.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},m.removeEvent=y.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){var d="on"+b;a.detachEvent&&(typeof a[d]===K&&(a[d]=null),a.detachEvent(d,c))},m.Event=function(a,b){return this instanceof m.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&a.returnValue===!1?ab:bb):this.type=a,b&&m.extend(this,b),this.timeStamp=a&&a.timeStamp||m.now(),void(this[m.expando]=!0)):new m.Event(a,b)},m.Event.prototype={isDefaultPrevented:bb,isPropagationStopped:bb,isImmediatePropagationStopped:bb,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=ab,a&&(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=ab,a&&(a.stopPropagation&&a.stopPropagation(),a.cance
 lBubble=!0)},stopImmediatePropagation:function(){var a=this.originalEvent;this.isImmediatePropagationStopped=ab,a&&a.stopImmediatePropagation&&a.stopImmediatePropagation(),this.stopPropagation()}},m.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(a,b){m.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj;return(!e||e!==d&&!m.contains(d,e))&&(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),k.submitBubbles||(m.event.special.submit={setup:function(){return m.nodeName(this,"form")?!1:void m.event.add(this,"click._submit keypress._submit",function(a){var b=a.target,c=m.nodeName(b,"input")||m.nodeName(b,"button")?b.form:void 0;c&&!m._data(c,"submitBubbles")&&(m.event.add(c,"submit._submit",function(a){a._submit_bubble=!0}),m._data(c,"submitBubbles",!0))})},postDispatch:function(a){a._submit_bubble&&(delete a._submit_bubble,this.parentNode&&!a.isTrig
 ger&&m.event.simulate("submit",this.parentNode,a,!0))},teardown:function(){return m.nodeName(this,"form")?!1:void m.event.remove(this,"._submit")}}),k.changeBubbles||(m.event.special.change={setup:function(){return X.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(m.event.add(this,"propertychange._change",function(a){"checked"===a.originalEvent.propertyName&&(this._just_changed=!0)}),m.event.add(this,"click._change",function(a){this._just_changed&&!a.isTrigger&&(this._just_changed=!1),m.event.simulate("change",this,a,!0)})),!1):void m.event.add(this,"beforeactivate._change",function(a){var b=a.target;X.test(b.nodeName)&&!m._data(b,"changeBubbles")&&(m.event.add(b,"change._change",function(a){!this.parentNode||a.isSimulated||a.isTrigger||m.event.simulate("change",this.parentNode,a,!0)}),m._data(b,"changeBubbles",!0))})},handle:function(a){var b=a.target;return this!==b||a.isSimulated||a.isTrigger||"radio"!==b.type&&"checkbox"!==b.type?a.handleObj.handler.apply(th
 is,arguments):void 0},teardown:function(){return m.event.remove(this,"._change"),!X.test(this.nodeName)}}),k.focusinBubbles||m.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){m.event.simulate(b,a.target,m.event.fix(a),!0)};m.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=m._data(d,b);e||d.addEventListener(a,c,!0),m._data(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=m._data(d,b)-1;e?m._data(d,b,e):(d.removeEventListener(a,c,!0),m._removeData(d,b))}}}),m.fn.extend({on:function(a,b,c,d,e){var f,g;if("object"==typeof a){"string"!=typeof b&&(c=c||b,b=void 0);for(f in a)this.on(f,b,c,a[f],e);return this}if(null==c&&null==d?(d=b,c=b=void 0):null==d&&("string"==typeof b?(d=c,c=void 0):(d=c,c=b,b=void 0)),d===!1)d=bb;else if(!d)return this;return 1===e&&(g=d,d=function(a){return m().off(a),g.apply(this,arguments)},d.guid=g.guid||(g.guid=m.guid++)),this.each(function(){m.event.add(this,a,d,c,b)})},one:function(a,b,c,d){return 
 this.on(a,b,c,d,1)},off:function(a,b,c){var d,e;if(a&&a.preventDefault&&a.handleObj)return d=a.handleObj,m(a.delegateTarget).off(d.namespace?d.origType+"."+d.namespace:d.origType,d.selector,d.handler),this;if("object"==typeof a){for(e in a)this.off(e,b,a[e]);return this}return(b===!1||"function"==typeof b)&&(c=b,b=void 0),c===!1&&(c=bb),this.each(function(){m.event.remove(this,a,c,b)})},trigger:function(a,b){return this.each(function(){m.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];return c?m.event.trigger(a,b,c,!0):void 0}});function db(a){var b=eb.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}var eb="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",fb=/ jQuery\d+="(?:null|\d+)"/g,gb=new RegExp("<(?:"+eb+")[\\s/>]","i"),hb=/^\s+/,ib=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]
 +)[^>]*)\/>/gi,jb=/<([\w:]+)/,kb=/<tbody/i,lb=/<|&#?\w+;/,mb=/<(?:script|style|link)/i,nb=/checked\s*(?:[^=]|=\s*.checked.)/i,ob=/^$|\/(?:java|ecma)script/i,pb=/^true\/(.*)/,qb=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,rb={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:k.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]},sb=db(y),tb=sb.appendChild(y.createElement("div"));rb.optgroup=rb.option,rb.tbody=rb.tfoot=rb.colgroup=rb.caption=rb.thead,rb.th=rb.td;function ub(a,b){var c,d,e=0,f=typeof a.getElementsByTagName!==K?a.getElementsByTagName(b||"*"):typeof a.querySelectorAll!==K?a.querySelectorAll(b||"*"):void 0;if(!f)for(f=[],c=a.childNodes||a;null!=(d=c[e]);e++)!b||m.nodeName(d,b)?f.push
 (d):m.merge(f,ub(d,b));return void 0===b||b&&m.nodeName(a,b)?m.merge([a],f):f}function vb(a){W.test(a.type)&&(a.defaultChecked=a.checked)}function wb(a,b){return m.nodeName(a,"table")&&m.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function xb(a){return a.type=(null!==m.find.attr(a,"type"))+"/"+a.type,a}function yb(a){var b=pb.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function zb(a,b){for(var c,d=0;null!=(c=a[d]);d++)m._data(c,"globalEval",!b||m._data(b[d],"globalEval"))}function Ab(a,b){if(1===b.nodeType&&m.hasData(a)){var c,d,e,f=m._data(a),g=m._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;e>d;d++)m.event.add(b,c,h[c][d])}g.data&&(g.data=m.extend({},g.data))}}function Bb(a,b){var c,d,e;if(1===b.nodeType){if(c=b.nodeName.toLowerCase(),!k.noCloneEvent&&b[m.expando]){e=m._data(b);for(d in e.events)m.removeEvent(b,d,e.handle);b.rem
 oveAttribute(m.expando)}"script"===c&&b.text!==a.text?(xb(b).text=a.text,yb(b)):"object"===c?(b.parentNode&&(b.outerHTML=a.outerHTML),k.html5Clone&&a.innerHTML&&!m.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):"input"===c&&W.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):"option"===c?b.defaultSelected=b.selected=a.defaultSelected:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}}m.extend({clone:function(a,b,c){var d,e,f,g,h,i=m.contains(a.ownerDocument,a);if(k.html5Clone||m.isXMLDoc(a)||!gb.test("<"+a.nodeName+">")?f=a.cloneNode(!0):(tb.innerHTML=a.outerHTML,tb.removeChild(f=tb.firstChild)),!(k.noCloneEvent&&k.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||m.isXMLDoc(a)))for(d=ub(f),h=ub(a),g=0;null!=(e=h[g]);++g)d[g]&&Bb(e,d[g]);if(b)if(c)for(h=h||ub(a),d=d||ub(f),g=0;null!=(e=h[g]);g++)Ab(e,d[g]);else Ab(a,f);return d=ub(f,"script"),d.length>0&&zb(d,!i&&ub(a,"script")),d=h=e=null,f},buildFragment:function(a,b,c,d){for(var e
 ,f,g,h,i,j,l,n=a.length,o=db(b),p=[],q=0;n>q;q++)if(f=a[q],f||0===f)if("object"===m.type(f))m.merge(p,f.nodeType?[f]:f);else if(lb.test(f)){h=h||o.appendChild(b.createElement("div")),i=(jb.exec(f)||["",""])[1].toLowerCase(),l=rb[i]||rb._default,h.innerHTML=l[1]+f.replace(ib,"<$1></$2>")+l[2],e=l[0];while(e--)h=h.lastChild;if(!k.leadingWhitespace&&hb.test(f)&&p.push(b.createTextNode(hb.exec(f)[0])),!k.tbody){f="table"!==i||kb.test(f)?"<table>"!==l[1]||kb.test(f)?0:h:h.firstChild,e=f&&f.childNodes.length;while(e--)m.nodeName(j=f.childNodes[e],"tbody")&&!j.childNodes.length&&f.removeChild(j)}m.merge(p,h.childNodes),h.textContent="";while(h.firstChild)h.removeChild(h.firstChild);h=o.lastChild}else p.push(b.createTextNode(f));h&&o.removeChild(h),k.appendChecked||m.grep(ub(p,"input"),vb),q=0;while(f=p[q++])if((!d||-1===m.inArray(f,d))&&(g=m.contains(f.ownerDocument,f),h=ub(o.appendChild(f),"script"),g&&zb(h),c)){e=0;while(f=h[e++])ob.test(f.type||"")&&c.push(f)}return h=null,o},cleanData:
 function(a,b){for(var d,e,f,g,h=0,i=m.expando,j=m.cache,l=k.deleteExpando,n=m.event.special;null!=(d=a[h]);h++)if((b||m.acceptData(d))&&(f=d[i],g=f&&j[f])){if(g.events)for(e in g.events)n[e]?m.event.remove(d,e):m.removeEvent(d,e,g.handle);j[f]&&(delete j[f],l?delete d[i]:typeof d.removeAttribute!==K?d.removeAttribute(i):d[i]=null,c.push(f))}}}),m.fn.extend({text:function(a){return V(this,function(a){return void 0===a?m.text(this):this.empty().append((this[0]&&this[0].ownerDocument||y).createTextNode(a))},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=wb(this,a);b.appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=wb(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:fu
 nction(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?m.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||m.cleanData(ub(c)),c.parentNode&&(b&&m.contains(c.ownerDocument,c)&&zb(ub(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++){1===a.nodeType&&m.cleanData(ub(a,!1));while(a.firstChild)a.removeChild(a.firstChild);a.options&&m.nodeName(a,"select")&&(a.options.length=0)}return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return m.clone(this,a,b)})},html:function(a){return V(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a)return 1===b.nodeType?b.innerHTML.replace(fb,""):void 0;if(!("string"!=typeof a||mb.test(a)||!k.htmlSerialize&&gb.test(a)||!k.leadingWhitespace&&hb.test(a)||rb[(jb.exec(a)||["",""])[1].toLowerCase()])){a=a.replace(ib,"<$1></$2>");try{for(;d>c;
 c++)b=this[c]||{},1===b.nodeType&&(m.cleanData(ub(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=arguments[0];return this.domManip(arguments,function(b){a=this.parentNode,m.cleanData(ub(this)),a&&a.replaceChild(b,this)}),a&&(a.length||a.nodeType)?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b){a=e.apply([],a);var c,d,f,g,h,i,j=0,l=this.length,n=this,o=l-1,p=a[0],q=m.isFunction(p);if(q||l>1&&"string"==typeof p&&!k.checkClone&&nb.test(p))return this.each(function(c){var d=n.eq(c);q&&(a[0]=p.call(this,c,d.html())),d.domManip(a,b)});if(l&&(i=m.buildFragment(a,this[0].ownerDocument,!1,this),c=i.firstChild,1===i.childNodes.length&&(i=c),c)){for(g=m.map(ub(i,"script"),xb),f=g.length;l>j;j++)d=i,j!==o&&(d=m.clone(d,!0,!0),f&&m.merge(g,ub(d,"script"))),b.call(this[j],d,j);if(f)for(h=g[g.length-1].ownerDocument,m.map(g,yb),j=0;f>j;j++)d=g[j],ob.test(d.type||"")&&!m._data(d,"globalEv
 al")&&m.contains(h,d)&&(d.src?m._evalUrl&&m._evalUrl(d.src):m.globalEval((d.text||d.textContent||d.innerHTML||"").replace(qb,"")));i=c=null}return this}}),m.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){m.fn[a]=function(a){for(var c,d=0,e=[],g=m(a),h=g.length-1;h>=d;d++)c=d===h?this:this.clone(!0),m(g[d])[b](c),f.apply(e,c.get());return this.pushStack(e)}});var Cb,Db={};function Eb(b,c){var d,e=m(c.createElement(b)).appendTo(c.body),f=a.getDefaultComputedStyle&&(d=a.getDefaultComputedStyle(e[0]))?d.display:m.css(e[0],"display");return e.detach(),f}function Fb(a){var b=y,c=Db[a];return c||(c=Eb(a,b),"none"!==c&&c||(Cb=(Cb||m("<iframe frameborder='0' width='0' height='0'/>")).appendTo(b.documentElement),b=(Cb[0].contentWindow||Cb[0].contentDocument).document,b.write(),b.close(),c=Eb(a,b),Cb.detach()),Db[a]=c),c}!function(){var a;k.shrinkWrapBlocks=function(){if(null!=a)return a;a=!1;var b,c,d;return c=y.ge
 tElementsByTagName("body")[0],c&&c.style?(b=y.createElement("div"),d=y.createElement("div"),d.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(d).appendChild(b),typeof b.style.zoom!==K&&(b.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:1px;width:1px;zoom:1",b.appendChild(y.createElement("div")).style.width="5px",a=3!==b.offsetWidth),c.removeChild(d),a):void 0}}();var Gb=/^margin/,Hb=new RegExp("^("+S+")(?!px)[a-z%]+$","i"),Ib,Jb,Kb=/^(top|right|bottom|left)$/;a.getComputedStyle?(Ib=function(a){return a.ownerDocument.defaultView.getComputedStyle(a,null)},Jb=function(a,b,c){var d,e,f,g,h=a.style;return c=c||Ib(a),g=c?c.getPropertyValue(b)||c[b]:void 0,c&&(""!==g||m.contains(a.ownerDocument,a)||(g=m.style(a,b)),Hb.test(g)&&Gb.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=g,g=c.width,h.width=d,h.minWidth=e,h.maxWidth=f)),void
  0===g?g:g+""}):y.documentElement.currentStyle&&(Ib=function(a){return a.currentStyle},Jb=function(a,b,c){var d,e,f,g,h=a.style;return c=c||Ib(a),g=c?c[b]:void 0,null==g&&h&&h[b]&&(g=h[b]),Hb.test(g)&&!Kb.test(b)&&(d=h.left,e=a.runtimeStyle,f=e&&e.left,f&&(e.left=a.currentStyle.left),h.left="fontSize"===b?"1em":g,g=h.pixelLeft+"px",h.left=d,f&&(e.left=f)),void 0===g?g:g+""||"auto"});function Lb(a,b){return{get:function(){var c=a();if(null!=c)return c?void delete this.get:(this.get=b).apply(this,arguments)}}}!function(){var b,c,d,e,f,g,h;if(b=y.createElement("div"),b.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",d=b.getElementsByTagName("a")[0],c=d&&d.style){c.cssText="float:left;opacity:.5",k.opacity="0.5"===c.opacity,k.cssFloat=!!c.cssFloat,b.style.backgroundClip="content-box",b.cloneNode(!0).style.backgroundClip="",k.clearCloneStyle="content-box"===b.style.backgroundClip,k.boxSizing=""===c.boxSizing||""===c.MozBoxSizing||""===c.WebkitBoxSizing,m.ex
 tend(k,{reliableHiddenOffsets:function(){return null==g&&i(),g},boxSizingReliable:function(){return null==f&&i(),f},pixelPosition:function(){return null==e&&i(),e},reliableMarginRight:function(){return null==h&&i(),h}});function i(){var b,c,d,i;c=y.getElementsByTagName("body")[0],c&&c.style&&(b=y.createElement("div"),d=y.createElement("div"),d.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(d).appendChild(b),b.style.cssText="-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;display:block;margin-top:1%;top:1%;border:1px;padding:1px;width:4px;position:absolute",e=f=!1,h=!0,a.getComputedStyle&&(e="1%"!==(a.getComputedStyle(b,null)||{}).top,f="4px"===(a.getComputedStyle(b,null)||{width:"4px"}).width,i=b.appendChild(y.createElement("div")),i.style.cssText=b.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:0",i.style.marginRight=
 i.style.width="0",b.style.width="1px",h=!parseFloat((a.getComputedStyle(i,null)||{}).marginRight)),b.innerHTML="<table><tr><td></td><td>t</td></tr></table>",i=b.getElementsByTagName("td"),i[0].style.cssText="margin:0;border:0;padding:0;display:none",g=0===i[0].offsetHeight,g&&(i[0].style.display="",i[1].style.display="none",g=0===i[0].offsetHeight),c.removeChild(d))}}}(),m.swap=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e};var Mb=/alpha\([^)]*\)/i,Nb=/opacity\s*=\s*([^)]*)/,Ob=/^(none|table(?!-c[ea]).+)/,Pb=new RegExp("^("+S+")(.*)$","i"),Qb=new RegExp("^([+-])=("+S+")","i"),Rb={position:"absolute",visibility:"hidden",display:"block"},Sb={letterSpacing:"0",fontWeight:"400"},Tb=["Webkit","O","Moz","ms"];function Ub(a,b){if(b in a)return b;var c=b.charAt(0).toUpperCase()+b.slice(1),d=b,e=Tb.length;while(e--)if(b=Tb[e]+c,b in a)return b;return d}function Vb(a,b){for(var c,d,e,f=[],g=0,h=a.length;h>g;g++
 )d=a[g],d.style&&(f[g]=m._data(d,"olddisplay"),c=d.style.display,b?(f[g]||"none"!==c||(d.style.display=""),""===d.style.display&&U(d)&&(f[g]=m._data(d,"olddisplay",Fb(d.nodeName)))):(e=U(d),(c&&"none"!==c||!e)&&m._data(d,"olddisplay",e?c:m.css(d,"display"))));for(g=0;h>g;g++)d=a[g],d.style&&(b&&"none"!==d.style.display&&""!==d.style.display||(d.style.display=b?f[g]||"":"none"));return a}function Wb(a,b,c){var d=Pb.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||"px"):b}function Xb(a,b,c,d,e){for(var f=c===(d?"border":"content")?4:"width"===b?1:0,g=0;4>f;f+=2)"margin"===c&&(g+=m.css(a,c+T[f],!0,e)),d?("content"===c&&(g-=m.css(a,"padding"+T[f],!0,e)),"margin"!==c&&(g-=m.css(a,"border"+T[f]+"Width",!0,e))):(g+=m.css(a,"padding"+T[f],!0,e),"padding"!==c&&(g+=m.css(a,"border"+T[f]+"Width",!0,e)));return g}function Yb(a,b,c){var d=!0,e="width"===b?a.offsetWidth:a.offsetHeight,f=Ib(a),g=k.boxSizing&&"border-box"===m.css(a,"boxSizing",!1,f);if(0>=e||null==e){if(e=Jb(a,b,f),(0>e||null==e)&&(
 e=a.style[b]),Hb.test(e))return e;d=g&&(k.boxSizingReliable()||e===a.style[b]),e=parseFloat(e)||0}return e+Xb(a,b,c||(g?"border":"content"),d,f)+"px"}m.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=Jb(a,"opacity");return""===c?"1":c}}}},cssNumber:{columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":k.cssFloat?"cssFloat":"styleFloat"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=m.camelCase(b),i=a.style;if(b=m.cssProps[h]||(m.cssProps[h]=Ub(i,h)),g=m.cssHooks[b]||m.cssHooks[h],void 0===c)return g&&"get"in g&&void 0!==(e=g.get(a,!1,d))?e:i[b];if(f=typeof c,"string"===f&&(e=Qb.exec(c))&&(c=(e[1]+1)*e[2]+parseFloat(m.css(a,b)),f="number"),null!=c&&c===c&&("number"!==f||m.cssNumber[h]||(c+="px"),k.clearCloneStyle||""!==c||0!==b.indexOf("background")||(i[b]="inherit"),!(g&&"set"in g&&void 0===(c=g.set(a,c,d)))))try{i[b]=c}catch(j){}
 }},css:function(a,b,c,d){var e,f,g,h=m.camelCase(b);return b=m.cssProps[h]||(m.cssProps[h]=Ub(a.style,h)),g=m.cssHooks[b]||m.cssHooks[h],g&&"get"in g&&(f=g.get(a,!0,c)),void 0===f&&(f=Jb(a,b,d)),"normal"===f&&b in Sb&&(f=Sb[b]),""===c||c?(e=parseFloat(f),c===!0||m.isNumeric(e)?e||0:f):f}}),m.each(["height","width"],function(a,b){m.cssHooks[b]={get:function(a,c,d){return c?Ob.test(m.css(a,"display"))&&0===a.offsetWidth?m.swap(a,Rb,function(){return Yb(a,b,d)}):Yb(a,b,d):void 0},set:function(a,c,d){var e=d&&Ib(a);return Wb(a,c,d?Xb(a,b,d,k.boxSizing&&"border-box"===m.css(a,"boxSizing",!1,e),e):0)}}}),k.opacity||(m.cssHooks.opacity={get:function(a,b){return Nb.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=m.isNumeric(b)?"alpha(opacity="+100*b+")":"",f=d&&d.filter||c.filter||"";c.zoom=1,(b>=1||""===b)&&""===m.trim(f.replace(Mb,""))&&c.removeAttribute&&(c.removeAttribute("filter
 "),""===b||d&&!d.filter)||(c.filter=Mb.test(f)?f.replace(Mb,e):f+" "+e)}}),m.cssHooks.marginRight=Lb(k.reliableMarginRight,function(a,b){return b?m.swap(a,{display:"inline-block"},Jb,[a,"marginRight"]):void 0}),m.each({margin:"",padding:"",border:"Width"},function(a,b){m.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];4>d;d++)e[a+T[d]+b]=f[d]||f[d-2]||f[0];return e}},Gb.test(a)||(m.cssHooks[a+b].set=Wb)}),m.fn.extend({css:function(a,b){return V(this,function(a,b,c){var d,e,f={},g=0;if(m.isArray(b)){for(d=Ib(a),e=b.length;e>g;g++)f[b[g]]=m.css(a,b[g],!1,d);return f}return void 0!==c?m.style(a,b,c):m.css(a,b)},a,b,arguments.length>1)},show:function(){return Vb(this,!0)},hide:function(){return Vb(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){U(this)?m(this).show():m(this).hide()})}});function Zb(a,b,c,d,e){return new Zb.prototype.init(a,b,c,d,e)}m.Tween=Zb,Zb.prototype={constructor:Zb,init:fun
 ction(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||"swing",this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(m.cssNumber[c]?"":"px")
+},cur:function(){var a=Zb.propHooks[this.prop];return a&&a.get?a.get(this):Zb.propHooks._default.get(this)},run:function(a){var b,c=Zb.propHooks[this.prop];return this.pos=b=this.options.duration?m.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):Zb.propHooks._default.set(this),this}},Zb.prototype.init.prototype=Zb.prototype,Zb.propHooks={_default:{get:function(a){var b;return null==a.elem[a.prop]||a.elem.style&&null!=a.elem.style[a.prop]?(b=m.css(a.elem,a.prop,""),b&&"auto"!==b?b:0):a.elem[a.prop]},set:function(a){m.fx.step[a.prop]?m.fx.step[a.prop](a):a.elem.style&&(null!=a.elem.style[m.cssProps[a.prop]]||m.cssHooks[a.prop])?m.style(a.elem,a.prop,a.now+a.unit):a.elem[a.prop]=a.now}}},Zb.propHooks.scrollTop=Zb.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},m.easing={linear:fu
 nction(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2}},m.fx=Zb.prototype.init,m.fx.step={};var $b,_b,ac=/^(?:toggle|show|hide)$/,bc=new RegExp("^(?:([+-])=|)("+S+")([a-z%]*)$","i"),cc=/queueHooks$/,dc=[ic],ec={"*":[function(a,b){var c=this.createTween(a,b),d=c.cur(),e=bc.exec(b),f=e&&e[3]||(m.cssNumber[a]?"":"px"),g=(m.cssNumber[a]||"px"!==f&&+d)&&bc.exec(m.css(c.elem,a)),h=1,i=20;if(g&&g[3]!==f){f=f||g[3],e=e||[],g=+d||1;do h=h||".5",g/=h,m.style(c.elem,a,g+f);while(h!==(h=c.cur()/d)&&1!==h&&--i)}return e&&(g=c.start=+g||+d||0,c.unit=f,c.end=e[1]?g+(e[1]+1)*e[2]:+e[2]),c}]};function fc(){return setTimeout(function(){$b=void 0}),$b=m.now()}function gc(a,b){var c,d={height:a},e=0;for(b=b?1:0;4>e;e+=2-b)c=T[e],d["margin"+c]=d["padding"+c]=a;return b&&(d.opacity=d.width=a),d}function hc(a,b,c){for(var d,e=(ec[b]||[]).concat(ec["*"]),f=0,g=e.length;g>f;f++)if(d=e[f].call(c,b,a))return d}function ic(a,b,c){var d,e,f,g,h,i,j,l,n=this,o={},p=a.style,q=a.nodeType&&U(a),r=m._
 data(a,"fxshow");c.queue||(h=m._queueHooks(a,"fx"),null==h.unqueued&&(h.unqueued=0,i=h.empty.fire,h.empty.fire=function(){h.unqueued||i()}),h.unqueued++,n.always(function(){n.always(function(){h.unqueued--,m.queue(a,"fx").length||h.empty.fire()})})),1===a.nodeType&&("height"in b||"width"in b)&&(c.overflow=[p.overflow,p.overflowX,p.overflowY],j=m.css(a,"display"),l="none"===j?m._data(a,"olddisplay")||Fb(a.nodeName):j,"inline"===l&&"none"===m.css(a,"float")&&(k.inlineBlockNeedsLayout&&"inline"!==Fb(a.nodeName)?p.zoom=1:p.display="inline-block")),c.overflow&&(p.overflow="hidden",k.shrinkWrapBlocks()||n.always(function(){p.overflow=c.overflow[0],p.overflowX=c.overflow[1],p.overflowY=c.overflow[2]}));for(d in b)if(e=b[d],ac.exec(e)){if(delete b[d],f=f||"toggle"===e,e===(q?"hide":"show")){if("show"!==e||!r||void 0===r[d])continue;q=!0}o[d]=r&&r[d]||m.style(a,d)}else j=void 0;if(m.isEmptyObject(o))"inline"===("none"===j?Fb(a.nodeName):j)&&(p.display=j);else{r?"hidden"in r&&(q=r.hidden):r=m
 ._data(a,"fxshow",{}),f&&(r.hidden=!q),q?m(a).show():n.done(function(){m(a).hide()}),n.done(function(){var b;m._removeData(a,"fxshow");for(b in o)m.style(a,b,o[b])});for(d in o)g=hc(q?r[d]:0,d,n),d in r||(r[d]=g.start,q&&(g.end=g.start,g.start="width"===d||"height"===d?1:0))}}function jc(a,b){var c,d,e,f,g;for(c in a)if(d=m.camelCase(c),e=b[d],f=a[c],m.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=m.cssHooks[d],g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}function kc(a,b,c){var d,e,f=0,g=dc.length,h=m.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=$b||fc(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;i>g;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),1>f&&i?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:m.extend({},b),opts:m.extend(!0,{specialEasing:{}},c),originalProperties:b,originalOptions:c,startTime:$b||fc(),duration:c.durati
 on,tweens:[],createTween:function(b,c){var d=m.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(d),d},stop:function(b){var c=0,d=b?j.tweens.length:0;if(e)return this;for(e=!0;d>c;c++)j.tweens[c].run(1);return b?h.resolveWith(a,[j,b]):h.rejectWith(a,[j,b]),this}}),k=j.props;for(jc(k,j.opts.specialEasing);g>f;f++)if(d=dc[f].call(j,a,k,j.opts))return d;return m.map(k,hc,j),m.isFunction(j.opts.start)&&j.opts.start.call(a,j),m.fx.timer(m.extend(i,{elem:a,anim:j,queue:j.opts.queue})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}m.Animation=m.extend(kc,{tweener:function(a,b){m.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");for(var c,d=0,e=a.length;e>d;d++)c=a[d],ec[c]=ec[c]||[],ec[c].unshift(b)},prefilter:function(a,b){b?dc.unshift(a):dc.push(a)}}),m.speed=function(a,b,c){var d=a&&"object"==typeof a?m.extend({},a):{complete:c||!c&&b||m.isFunction(a)&&a,duration:a,easing:c&&b||b&&!m.isFunction(b)&&b};return 
 d.duration=m.fx.off?0:"number"==typeof d.duration?d.duration:d.duration in m.fx.speeds?m.fx.speeds[d.duration]:m.fx.speeds._default,(null==d.queue||d.queue===!0)&&(d.queue="fx"),d.old=d.complete,d.complete=function(){m.isFunction(d.old)&&d.old.call(this),d.queue&&m.dequeue(this,d.queue)},d},m.fn.extend({fadeTo:function(a,b,c,d){return this.filter(U).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=m.isEmptyObject(a),f=m.speed(b,c,d),g=function(){var b=kc(this,m.extend({},a),f);(e||m._data(this,"finish"))&&b.stop(!0)};return g.finish=g,e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,b,c){var d=function(a){var b=a.stop;delete a.stop,b(c)};return"string"!=typeof a&&(c=b,b=a,a=void 0),b&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,e=null!=a&&a+"queueHooks",f=m.timers,g=m._data(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&cc.test(e)&&d(g[e]);for(e=f.length;e--;)f[e].elem!==this||null!=a&
 &f[e].queue!==a||(f[e].anim.stop(c),b=!1,f.splice(e,1));(b||!c)&&m.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=m._data(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=m.timers,g=d?d.length:0;for(c.finish=!0,m.queue(this,a,[]),e&&e.stop&&e.stop.call(this,!0),b=f.length;b--;)f[b].elem===this&&f[b].queue===a&&(f[b].anim.stop(!0),f.splice(b,1));for(b=0;g>b;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),m.each(["toggle","show","hide"],function(a,b){var c=m.fn[b];m.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(gc(b,!0),a,d,e)}}),m.each({slideDown:gc("show"),slideUp:gc("hide"),slideToggle:gc("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){m.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),m.timers=[],m.fx.tick=function(){var a,b=m.timers,c=0;for($b=m.now();c<b.length;c++)a=b[c],a()||b[c]!==a||b.splice(c--,1);b.length|
 |m.fx.stop(),$b=void 0},m.fx.timer=function(a){m.timers.push(a),a()?m.fx.start():m.timers.pop()},m.fx.interval=13,m.fx.start=function(){_b||(_b=setInterval(m.fx.tick,m.fx.interval))},m.fx.stop=function(){clearInterval(_b),_b=null},m.fx.speeds={slow:600,fast:200,_default:400},m.fn.delay=function(a,b){return a=m.fx?m.fx.speeds[a]||a:a,b=b||"fx",this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},function(){var a,b,c,d,e;b=y.createElement("div"),b.setAttribute("className","t"),b.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",d=b.getElementsByTagName("a")[0],c=y.createElement("select"),e=c.appendChild(y.createElement("option")),a=b.getElementsByTagName("input")[0],d.style.cssText="top:1px",k.getSetAttribute="t"!==b.className,k.style=/top/.test(d.getAttribute("style")),k.hrefNormalized="/a"===d.getAttribute("href"),k.checkOn=!!a.value,k.optSelected=e.selected,k.enctype=!!y.createElement("form").enctype,c.disabled=!0,k.opt
 Disabled=!e.disabled,a=y.createElement("input"),a.setAttribute("value",""),k.input=""===a.getAttribute("value"),a.value="t",a.setAttribute("type","radio"),k.radioValue="t"===a.value}();var lc=/\r/g;m.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=m.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,m(this).val()):a,null==e?e="":"number"==typeof e?e+="":m.isArray(e)&&(e=m.map(e,function(a){return null==a?"":a+""})),b=m.valHooks[this.type]||m.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=m.valHooks[e.type]||m.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(lc,""):null==c?"":c)}}}),m.extend({valHooks:{option:{get:function(a){var b=m.find.attr(a,"value");return null!=b?b:m.trim(m.text(a))}},select:{get:function(a){for(var b,c,d=a.options,e=a.selectedIndex,f="select-one"===a.type||0>e,g=f?
 null:[],h=f?e+1:d.length,i=0>e?h:f?e:0;h>i;i++)if(c=d[i],!(!c.selected&&i!==e||(k.optDisabled?c.disabled:null!==c.getAttribute("disabled"))||c.parentNode.disabled&&m.nodeName(c.parentNode,"optgroup"))){if(b=m(c).val(),f)return b;g.push(b)}return g},set:function(a,b){var c,d,e=a.options,f=m.makeArray(b),g=e.length;while(g--)if(d=e[g],m.inArray(m.valHooks.option.get(d),f)>=0)try{d.selected=c=!0}catch(h){d.scrollHeight}else d.selected=!1;return c||(a.selectedIndex=-1),e}}}}),m.each(["radio","checkbox"],function(){m.valHooks[this]={set:function(a,b){return m.isArray(b)?a.checked=m.inArray(m(a).val(),b)>=0:void 0}},k.checkOn||(m.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})});var mc,nc,oc=m.expr.attrHandle,pc=/^(?:checked|selected)$/i,qc=k.getSetAttribute,rc=k.input;m.fn.extend({attr:function(a,b){return V(this,m.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){m.removeAttr(this,a)})}}),m.extend({attr:function(a,b,c){v
 ar d,e,f=a.nodeType;if(a&&3!==f&&8!==f&&2!==f)return typeof a.getAttribute===K?m.prop(a,b,c):(1===f&&m.isXMLDoc(a)||(b=b.toLowerCase(),d=m.attrHooks[b]||(m.expr.match.bool.test(b)?nc:mc)),void 0===c?d&&"get"in d&&null!==(e=d.get(a,b))?e:(e=m.find.attr(a,b),null==e?void 0:e):null!==c?d&&"set"in d&&void 0!==(e=d.set(a,c,b))?e:(a.setAttribute(b,c+""),c):void m.removeAttr(a,b))},removeAttr:function(a,b){var c,d,e=0,f=b&&b.match(E);if(f&&1===a.nodeType)while(c=f[e++])d=m.propFix[c]||c,m.expr.match.bool.test(c)?rc&&qc||!pc.test(c)?a[d]=!1:a[m.camelCase("default-"+c)]=a[d]=!1:m.attr(a,c,""),a.removeAttribute(qc?c:d)},attrHooks:{type:{set:function(a,b){if(!k.radioValue&&"radio"===b&&m.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}}}),nc={set:function(a,b,c){return b===!1?m.removeAttr(a,c):rc&&qc||!pc.test(c)?a.setAttribute(!qc&&m.propFix[c]||c,c):a[m.camelCase("default-"+c)]=a[c]=!0,c}},m.each(m.expr.match.bool.source.match(/\w+/g),function(a,b){var c
 =oc[b]||m.find.attr;oc[b]=rc&&qc||!pc.test(b)?function(a,b,d){var e,f;return d||(f=oc[b],oc[b]=e,e=null!=c(a,b,d)?b.toLowerCase():null,oc[b]=f),e}:function(a,b,c){return c?void 0:a[m.camelCase("default-"+b)]?b.toLowerCase():null}}),rc&&qc||(m.attrHooks.value={set:function(a,b,c){return m.nodeName(a,"input")?void(a.defaultValue=b):mc&&mc.set(a,b,c)}}),qc||(mc={set:function(a,b,c){var d=a.getAttributeNode(c);return d||a.setAttributeNode(d=a.ownerDocument.createAttribute(c)),d.value=b+="","value"===c||b===a.getAttribute(c)?b:void 0}},oc.id=oc.name=oc.coords=function(a,b,c){var d;return c?void 0:(d=a.getAttributeNode(b))&&""!==d.value?d.value:null},m.valHooks.button={get:function(a,b){var c=a.getAttributeNode(b);return c&&c.specified?c.value:void 0},set:mc.set},m.attrHooks.contenteditable={set:function(a,b,c){mc.set(a,""===b?!1:b,c)}},m.each(["width","height"],function(a,b){m.attrHooks[b]={set:function(a,c){return""===c?(a.setAttribute(b,"auto"),c):void 0}}})),k.style||(m.attrHooks.styl
 e={get:function(a){return a.style.cssText||void 0},set:function(a,b){return a.style.cssText=b+""}});var sc=/^(?:input|select|textarea|button|object)$/i,tc=/^(?:a|area)$/i;m.fn.extend({prop:function(a,b){return V(this,m.prop,a,b,arguments.length>1)},removeProp:function(a){return a=m.propFix[a]||a,this.each(function(){try{this[a]=void 0,delete this[a]}catch(b){}})}}),m.extend({propFix:{"for":"htmlFor","class":"className"},prop:function(a,b,c){var d,e,f,g=a.nodeType;if(a&&3!==g&&8!==g&&2!==g)return f=1!==g||!m.isXMLDoc(a),f&&(b=m.propFix[b]||b,e=m.propHooks[b]),void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){var b=m.find.attr(a,"tabindex");return b?parseInt(b,10):sc.test(a.nodeName)||tc.test(a.nodeName)&&a.href?0:-1}}}}),k.hrefNormalized||m.each(["href","src"],function(a,b){m.propHooks[b]={get:function(a){return a.getAttribute(b,4)}}}),k.optSelected||(m.propHooks.selected={get:function(a){var b
 =a.parentNode;return b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex),null}}),m.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){m.propFix[this.toLowerCase()]=this}),k.enctype||(m.propFix.enctype="encoding");var uc=/[\t\r\n\f]/g;m.fn.extend({addClass:function(a){var b,c,d,e,f,g,h=0,i=this.length,j="string"==typeof a&&a;if(m.isFunction(a))return this.each(function(b){m(this).addClass(a.call(this,b,this.className))});if(j)for(b=(a||"").match(E)||[];i>h;h++)if(c=this[h],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(uc," "):" ")){f=0;while(e=b[f++])d.indexOf(" "+e+" ")<0&&(d+=e+" ");g=m.trim(d),c.className!==g&&(c.className=g)}return this},removeClass:function(a){var b,c,d,e,f,g,h=0,i=this.length,j=0===arguments.length||"string"==typeof a&&a;if(m.isFunction(a))return this.each(function(b){m(this).removeClass(a.call(this,b,this.className))});if(j)for(b=(a||"").match(E)|
 |[];i>h;h++)if(c=this[h],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(uc," "):"")){f=0;while(e=b[f++])while(d.indexOf(" "+e+" ")>=0)d=d.replace(" "+e+" "," ");g=a?m.trim(d):"",c.className!==g&&(c.className=g)}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):this.each(m.isFunction(a)?function(c){m(this).toggleClass(a.call(this,c,this.className,b),b)}:function(){if("string"===c){var b,d=0,e=m(this),f=a.match(E)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else(c===K||"boolean"===c)&&(this.className&&m._data(this,"__className__",this.className),this.className=this.className||a===!1?"":m._data(this,"__className__")||"")})},hasClass:function(a){for(var b=" "+a+" ",c=0,d=this.length;d>c;c++)if(1===this[c].nodeType&&(" "+this[c].className+" ").replace(uc," ").indexOf(b)>=0)return!0;return!1}}),m.each("blur focus focusin focusout load resize scroll unload click dblclick mou
 sedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){m.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),m.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)}});var vc=m.now(),wc=/\?/,xc=/(,)|(\[|{)|(}|])|"(?:[^"\\\r\n]|\\["\\\/bfnrt]|\\u[\da-fA-F]{4})*"\s*:?|true|false|null|-?(?!0\d)\d+(?:\.\d+|)(?:[eE][+-]?\d+|)/g;m.parseJSON=function(b){if(a.JSON&&a.JSON.parse)return a.JSON.parse(b+"");var c,d=null,e=m.trim(b+"");return e&&!m.trim(e.replace(xc,function(a,b,e,f){return c&&b&&(d=0),0===d?a:(c=e||b,d+=!f-!e,"")}))?Function("return "+e)():m.error("Invalid JSON: "+b)},m.parseXML=function(b
 ){var c,d;if(!b||"string"!=typeof b)return null;try{a.DOMParser?(d=new DOMParser,c=d.parseFromString(b,"text/xml")):(c=new ActiveXObject("Microsoft.XMLDOM"),c.async="false",c.loadXML(b))}catch(e){c=void 0}return c&&c.documentElement&&!c.getElementsByTagName("parsererror").length||m.error("Invalid XML: "+b),c};var yc,zc,Ac=/#.*$/,Bc=/([?&])_=[^&]*/,Cc=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Dc=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Ec=/^(?:GET|HEAD)$/,Fc=/^\/\//,Gc=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,Hc={},Ic={},Jc="*/".concat("*");try{zc=location.href}catch(Kc){zc=y.createElement("a"),zc.href="",zc=zc.href}yc=Gc.exec(zc.toLowerCase())||[];function Lc(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(E)||[];if(m.isFunction(c))while(d=f[e++])"+"===d.charAt(0)?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function Mc(a,b,c,d){var e={},f=a===Ic;function g(h){var i;return e[h]=!0,m.each
 (a[h]||[],function(a,h){var j=h(b,c,d);return"string"!=typeof j||f||e[j]?f?!(i=j):void 0:(b.dataTypes.unshift(j),g(j),!1)}),i}return g(b.dataTypes[0])||!e["*"]&&g("*")}function Nc(a,b){var c,d,e=m.ajaxSettings.flatOptions||{};for(d in b)void 0!==b[d]&&((e[d]?a:c||(c={}))[d]=b[d]);return c&&m.extend(!0,a,c),a}function Oc(a,b,c){var d,e,f,g,h=a.contents,i=a.dataTypes;while("*"===i[0])i.shift(),void 0===e&&(e=a.mimeType||b.getResponseHeader("Content-Type"));if(e)for(g in h)if(h[g]&&h[g].test(e)){i.unshift(g);break}if(i[0]in c)f=i[0];else{for(g in c){if(!i[0]||a.converters[g+" "+i[0]]){f=g;break}d||(d=g)}f=f||d}return f?(f!==i[0]&&i.unshift(f),c[f]):void 0}function Pc(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];f=k.shift();while(f)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if("*"===f)f=i;else if("*"!==i&&i!==f){if(g=j[i+" "+f]||j["* "+f],!g)f
 or(e in j)if(h=e.split(" "),h[1]===f&&(g=j[i+" "+h[0]]||j["* "+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a["throws"])b=g(b);else try{b=g(b)}catch(l){return{state:"parsererror",error:g?l:"No conversion from "+i+" to "+f}}}return{state:"success",data:b}}m.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:zc,type:"GET",isLocal:Dc.test(yc[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Jc,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":m.parseJSON,"text xml":m.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?Nc(Nc(a,m.ajaxSettings),b):Nc(m.ajaxSettings,a)},ajaxPrefilter:Lc(Hc),ajaxTransport:Lc(Ic),ajax:function(a,b){"
 object"==typeof a&&(b=a,a=void 0),b=b||{};var c,d,e,f,g,h,i,j,k=m.ajaxSetup({},b),l=k.context||k,n=k.context&&(l.nodeType||l.jquery)?m(l):m.event,o=m.Deferred(),p=m.Callbacks("once memory"),q=k.statusCode||{},r={},s={},t=0,u="canceled",v={readyState:0,getResponseHeader:function(a){var b;if(2===t){if(!j){j={};while(b=Cc.exec(f))j[b[1].toLowerCase()]=b[2]}b=j[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return 2===t?f:null},setRequestHeader:function(a,b){var c=a.toLowerCase();return t||(a=s[c]=s[c]||a,r[a]=b),this},overrideMimeType:function(a){return t||(k.mimeType=a),this},statusCode:function(a){var b;if(a)if(2>t)for(b in a)q[b]=[q[b],a[b]];else v.always(a[v.status]);return this},abort:function(a){var b=a||u;return i&&i.abort(b),x(0,b),this}};if(o.promise(v).complete=p.add,v.success=v.done,v.error=v.fail,k.url=((a||k.url||zc)+"").replace(Ac,"").replace(Fc,yc[1]+"//"),k.type=b.method||b.type||k.method||k.type,k.dataTypes=m.trim(k.dataType||"*").toLowerCase(
 ).match(E)||[""],null==k.crossDomain&&(c=Gc.exec(k.url.toLowerCase()),k.crossDomain=!(!c||c[1]===yc[1]&&c[2]===yc[2]&&(c[3]||("http:"===c[1]?"80":"443"))===(yc[3]||("http:"===yc[1]?"80":"443")))),k.data&&k.processData&&"string"!=typeof k.data&&(k.data=m.param(k.data,k.traditional)),Mc(Hc,k,b,v),2===t)return v;h=k.global,h&&0===m.active++&&m.event.trigger("ajaxStart"),k.type=k.type.toUpperCase(),k.hasContent=!Ec.test(k.type),e=k.url,k.hasContent||(k.data&&(e=k.url+=(wc.test(e)?"&":"?")+k.data,delete k.data),k.cache===!1&&(k.url=Bc.test(e)?e.replace(Bc,"$1_="+vc++):e+(wc.test(e)?"&":"?")+"_="+vc++)),k.ifModified&&(m.lastModified[e]&&v.setRequestHeader("If-Modified-Since",m.lastModified[e]),m.etag[e]&&v.setRequestHeader("If-None-Match",m.etag[e])),(k.data&&k.hasContent&&k.contentType!==!1||b.contentType)&&v.setRequestHeader("Content-Type",k.contentType),v.setRequestHeader("Accept",k.dataTypes[0]&&k.accepts[k.dataTypes[0]]?k.accepts[k.dataTypes[0]]+("*"!==k.dataTypes[0]?", "+Jc+"; q=0.0
 1":""):k.accepts["*"]);for(d in k.headers)v.setRequestHeader(d,k.headers[d]);if(k.beforeSend&&(k.beforeSend.call(l,v,k)===!1||2===t))return v.abort();u="abort";for(d in{success:1,error:1,complete:1})v[d](k[d]);if(i=Mc(Ic,k,b,v)){v.readyState=1,h&&n.trigger("ajaxSend",[v,k]),k.async&&k.timeout>0&&(g=setTimeout(function(){v.abort("timeout")},k.timeout));try{t=1,i.send(r,x)}catch(w){if(!(2>t))throw w;x(-1,w)}}else x(-1,"No Transport");function x(a,b,c,d){var j,r,s,u,w,x=b;2!==t&&(t=2,g&&clearTimeout(g),i=void 0,f=d||"",v.readyState=a>0?4:0,j=a>=200&&300>a||304===a,c&&(u=Oc(k,v,c)),u=Pc(k,u,v,j),j?(k.ifModified&&(w=v.getResponseHeader("Last-Modified"),w&&(m.lastModified[e]=w),w=v.getResponseHeader("etag"),w&&(m.etag[e]=w)),204===a||"HEAD"===k.type?x="nocontent":304===a?x="notmodified":(x=u.state,r=u.data,s=u.error,j=!s)):(s=x,(a||!x)&&(x="error",0>a&&(a=0))),v.status=a,v.statusText=(b||x)+"",j?o.resolveWith(l,[r,x,v]):o.rejectWith(l,[v,x,s]),v.statusCode(q),q=void 0,h&&n.trigger(j?"ajax
 Success":"ajaxError",[v,k,j?r:s]),p.fireWith(l,[v,x]),h&&(n.trigger("ajaxComplete",[v,k]),--m.active||m.event.trigger("ajaxStop")))}return v},getJSON:function(a,b,c){return m.get(a,b,c,"json")},getScript:function(a,b){return m.get(a,void 0,b,"script")}}),m.each(["get","post"],function(a,b){m[b]=function(a,c,d,e){return m.isFunction(c)&&(e=e||d,d=c,c=void 0),m.ajax({url:a,type:b,dataType:e,data:c,success:d})}}),m.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){m.fn[b]=function(a){return this.on(b,a)}}),m._evalUrl=function(a){return m.ajax({url:a,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})},m.fn.extend({wrapAll:function(a){if(m.isFunction(a))return this.each(function(b){m(this).wrapAll(a.call(this,b))});if(this[0]){var b=m(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&1===a.firstChild.nodeType)a=a.firstChild;return a}).append(this)}re
 turn this},wrapInner:function(a){return this.each(m.isFunction(a)?function(b){m(this).wrapInner(a.call(this,b))}:function(){var b=m(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=m.isFunction(a);return this.each(function(c){m(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){m.nodeName(this,"body")||m(this).replaceWith(this.childNodes)}).end()}}),m.expr.filters.hidden=function(a){return a.offsetWidth<=0&&a.offsetHeight<=0||!k.reliableHiddenOffsets()&&"none"===(a.style&&a.style.display||m.css(a,"display"))},m.expr.filters.visible=function(a){return!m.expr.filters.hidden(a)};var Qc=/%20/g,Rc=/\[\]$/,Sc=/\r?\n/g,Tc=/^(?:submit|button|image|reset|file)$/i,Uc=/^(?:input|select|textarea|keygen)/i;function Vc(a,b,c,d){var e;if(m.isArray(b))m.each(b,function(b,e){c||Rc.test(a)?d(a,e):Vc(a+"["+("object"==typeof e?b:"")+"]",e,c,d)});else if(c||"object"!==m.type(b))d(a,b);else for(e in b)Vc(a+"["+e+"]",b[e],c,d)}m.para
 m=function(a,b){var c,d=[],e=function(a,b){b=m.isFunction(b)?b():null==b?"":b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};if(void 0===b&&(b=m.ajaxSettings&&m.ajaxSettings.traditional),m.isArray(a)||a.jquery&&!m.isPlainObject(a))m.each(a,function(){e(this.name,this.value)});else for(c in a)Vc(c,a[c],b,e);return d.join("&").replace(Qc,"+")},m.fn.extend({serialize:function(){return m.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=m.prop(this,"elements");return a?m.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!m(this).is(":disabled")&&Uc.test(this.nodeName)&&!Tc.test(a)&&(this.checked||!W.test(a))}).map(function(a,b){var c=m(this).val();return null==c?null:m.isArray(c)?m.map(c,function(a){return{name:b.name,value:a.replace(Sc,"\r\n")}}):{name:b.name,value:c.replace(Sc,"\r\n")}}).get()}}),m.ajaxSettings.xhr=void 0!==a.ActiveXObject?function(){return!this.isLocal&&/

<TRUNCATED>

[12/60] [abbrv] incubator-usergrid git commit: cherry picking docs from master

[sn...@apache.org]

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/reference/contribute-code.html
----------------------------------------------------------------------
diff --git a/content/docs/reference/contribute-code.html b/content/docs/reference/contribute-code.html
new file mode 100644
index 0000000..03fc9c8
--- /dev/null
+++ b/content/docs/reference/contribute-code.html
@@ -0,0 +1,315 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>How to Contribute Code &amp; Docs &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+        <link rel="prev" title="Presentations &amp; Videos" href="presos-and-videos.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">How to Contribute Code &amp; Docs</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#code-contributions">Code Contributions</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#website-and-documentation-contributions">Website and Documentation Contributions</a></li>
+</ul>
+</li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>How to Contribute Code &amp; Docs</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/reference/contribute-code.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="how-to-contribute-code-docs">
+<h1>How to Contribute Code &amp; Docs<a class="headerlink" href="#how-to-contribute-code-docs" title="Permalink to this headline">¶</a></h1>
+<div class="section" id="code-contributions">
+<h2>Code Contributions<a class="headerlink" href="#code-contributions" title="Permalink to this headline">¶</a></h2>
+<p>The Usergrid project has adopted a policy for how code is to be
+contributed by external contributors, and by those who are committers on
+the project. You can read this policy here <a class="reference external" href="https://cwiki.apache.org/confluence/display/usergrid/Usergrid+Contribution+Workflow">Usergrid Contribution
+Workflow</a>.</p>
+<p>Basically, we use GitHub as our code review system. So you should fork
+the apache/incubator-usergrid repo and submit PRs back to the project.
+Here are are step-by-step guide for both both external contributors and
+committers:</p>
+<ul class="simple">
+<li><a class="reference external" href="https://cwiki.apache.org/confluence/display/usergrid/Usergrid+External+Contributors+Guide">External Contributors
+Guide</a></li>
+<li><a class="reference external" href="https://cwiki.apache.org/confluence/display/usergrid/Usergrid+Committers+Guide">Usergrid Committers
+Guide</a></li>
+</ul>
+</div>
+<div class="section" id="website-and-documentation-contributions">
+<h2>Website and Documentation Contributions<a class="headerlink" href="#website-and-documentation-contributions" title="Permalink to this headline">¶</a></h2>
+<p>Documentation is in the /docs directory of our Git repo, written in
+Markdown format and managed by the Sphinx documentation system. See the
+README.md there for more information.</p>
+</div>
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+      
+      
+        <a href="presos-and-videos.html" class="btn btn-neutral" title="Presentations &amp; Videos" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+      
+    </div>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/reference/presos-and-videos.html
----------------------------------------------------------------------
diff --git a/content/docs/reference/presos-and-videos.html b/content/docs/reference/presos-and-videos.html
new file mode 100644
index 0000000..6df605c
--- /dev/null
+++ b/content/docs/reference/presos-and-videos.html
@@ -0,0 +1,335 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>Presentations &amp; Videos &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+        <link rel="next" title="How to Contribute Code &amp; Docs" href="contribute-code.html"/>
+        <link rel="prev" title="Usergrid 2: Deploy to Tomcat" href="../installation/ug2-deploy-to-tomcat.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul class="current">
+<li class="toctree-l1 current"><a class="current reference internal" href="">Presentations &amp; Videos</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#building-mobile-apps-with-apache-usergrid">Building Mobile Apps with Apache Usergrid</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#how-to-contribute-to-apache-usergrid">How to Contribute to Apache Usergrid</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#apache-usergrid-internals">Apache Usergrid Internals</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#open-source-mobile-backend-on-cassandra">Open Source Mobile Backend on Cassandra</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#usergrid-overview">Usergrid Overview</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>Presentations &amp; Videos</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/reference/presos-and-videos.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="presentations-videos">
+<h1>Presentations &amp; Videos<a class="headerlink" href="#presentations-videos" title="Permalink to this headline">¶</a></h1>
+<div class="section" id="building-mobile-apps-with-apache-usergrid">
+<h2>Building Mobile Apps with Apache Usergrid<a class="headerlink" href="#building-mobile-apps-with-apache-usergrid" title="Permalink to this headline">¶</a></h2>
+<ul class="simple">
+<li>Screen-cast of a talk given by Dave Johnson at the All Things Open
+2014, Raleigh, NC.</li>
+</ul>
+<iframe width="560" height="315" src="https://www.youtube.com/embed/DjFG-QbxxLw" frameborder="0" allowfullscreen></iframe></div>
+<div class="section" id="how-to-contribute-to-apache-usergrid">
+<h2>How to Contribute to Apache Usergrid<a class="headerlink" href="#how-to-contribute-to-apache-usergrid" title="Permalink to this headline">¶</a></h2>
+<ul class="simple">
+<li>David Johnson at <a class="reference external" href="http://apacheconnorthamerica2014.sched.org/event/29971aabd3c86398be2ae93403c7d1d2">ApacheCon NA
+2014</a></li>
+</ul>
+<iframe src="http://www.slideshare.net/slideshow/embed_code/33275731" width="600" height="400" frameborder="0" marginwidth="0" marginheight="0" scrolling="no" style="border:1px solid #CCC; border-width:1px; margin-bottom:5px; max-width: 100%;" allowfullscreen> </iframe></div>
+<div class="section" id="apache-usergrid-internals">
+<h2>Apache Usergrid Internals<a class="headerlink" href="#apache-usergrid-internals" title="Permalink to this headline">¶</a></h2>
+<ul class="simple">
+<li>Sungju Jin</li>
+</ul>
+<iframe src="http://speakerdeck.com/player/f0cd95108c150131a1e7669157168c6d" width="600" height="400" frameborder="0" marginwidth="0" marginheight="0" scrolling="no" style="border:1px solid #CCC; border-width:1px; margin-bottom:5px; max-width: 100%;" allowfullscreen> </iframe></div>
+<div class="section" id="open-source-mobile-backend-on-cassandra">
+<h2>Open Source Mobile Backend on Cassandra<a class="headerlink" href="#open-source-mobile-backend-on-cassandra" title="Permalink to this headline">¶</a></h2>
+<ul class="simple">
+<li>Ed Anuff</li>
+</ul>
+<iframe src="http://www.slideshare.net/slideshow/embed_code/13919079" width="600" height="400" frameborder="0" marginwidth="0" marginheight="0" scrolling="no" style="border:1px solid #CCC; border-width:1px; margin-bottom:5px; max-width: 100%;" allowfullscreen> </iframe></div>
+<div class="section" id="usergrid-overview">
+<h2>Usergrid Overview<a class="headerlink" href="#usergrid-overview" title="Permalink to this headline">¶</a></h2>
+<ul class="simple">
+<li>Ed Anuff</li>
+</ul>
+<iframe src="http://www.slideshare.net/slideshow/embed_code/9476483" width="600" height="400" frameborder="0" marginwidth="0" marginheight="0" scrolling="no" style="border:1px solid #CCC; border-width
+
+## Cassandra at Apigee, Usergrid Powering Mobile
+- Video of talk given by Ed Anuff at the Cassandra Summit 2012, Santa Clara, CA.
+
+<iframe width="640" height="360" src="http://www.youtube.com/embed/RuJwIBu3jvs?rel=0" frameborder="0" allowfullscreen></iframe></div>
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+      
+        <a href="contribute-code.html" class="btn btn-neutral float-right" title="How to Contribute Code &amp; Docs" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+      
+      
+        <a href="../installation/ug2-deploy-to-tomcat.html" class="btn btn-neutral" title="Usergrid 2: Deploy to Tomcat" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+      
+    </div>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

[41/60] [abbrv] incubator-usergrid git commit: For review purposes.

[sn...@apache.org]

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/24aa4da8/content/docs/rest-endpoints/api-reference.html
----------------------------------------------------------------------
diff --git a/content/docs/rest-endpoints/api-reference.html b/content/docs/rest-endpoints/api-reference.html
new file mode 100644
index 0000000..1241a65
--- /dev/null
+++ b/content/docs/rest-endpoints/api-reference.html
@@ -0,0 +1,5867 @@
+<html>
+<head>
+    <title>Usergrid API Reference</title>
+    
+    <!-- Latest compiled and minified CSS -->
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css">
+    
+    <!-- Optional theme -->
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap-theme.min.css">
+
+    <link rel="stylesheet" href="api-docs.css">
+    
+</head>
+<body>
+
+<div class="row">
+    <div class="col-md-1"></div>
+    <div class="col-md-10">
+    
+    <h1>Usergrid API Reference</h1>
+    <p>Generated from Swagger.</p>
+<h2>Methods</h2><p>API methods are organized by the tags.</p>
+<p>Following the methods is a listing of all <a href='#models'>Default Entity Models.</p>
+<a name='Action-method'></a>
+<h2>Action Methods</h2>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading GET">
+        <h2 class="panel-title GET-heading">GET /management/orgs/{orgId}/activate 
+            <a data-toggle="collapse" data-target="#collapse-iN5h4Rfha6"
+                href="#collapse-iN5h4Rfha6" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-iN5h4Rfha6" class="panel-body collapse">
+
+        <p>Activate an organization from a link provIded in an email notification.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>token</b> () <br>
+                    Activation token. (Specified in query).
+                </li>
+                <li>
+                    <b>confirm_email</b> () <br>
+                    Send confirmation email or not. (Specified in query).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of complete messages.</li>
+                        <li>Schema: [<a href="#action">Action</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading GET">
+        <h2 class="panel-title GET-heading">GET /management/orgs/{orgId}/reactivate 
+            <a data-toggle="collapse" data-target="#collapse-4JPBNBUnYR"
+                href="#collapse-4JPBNBUnYR" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-4JPBNBUnYR" class="panel-body collapse">
+
+        <p>Reactivate an expired organization.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of complete messages.</li>
+                        <li>Schema: [<a href="#action">Action</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading GET">
+        <h2 class="panel-title GET-heading">GET /management/users/resetpw 
+            <a data-toggle="collapse" data-target="#collapse-8Q4qhiQLvH"
+                href="#collapse-8Q4qhiQLvH" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-8Q4qhiQLvH" class="panel-body collapse">
+
+        <p>Initiate the reset of an admin user&#39;s password.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of complete messages.</li>
+                        <li>Schema: [<a href="#action">Action</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading POST">
+        <h2 class="panel-title POST-heading">POST /management/users/resetpw 
+            <a data-toggle="collapse" data-target="#collapse-TBw5HyJTTa"
+                href="#collapse-TBw5HyJTTa" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-TBw5HyJTTa" class="panel-body collapse">
+
+        <p>Complete the password reset through getting the newpassword and the old one for identification.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>ResetPWMsg</b> (                    <a href="#resetpwmsg">ResetPWMsg</a>) <br>
+                    Parameters and value for the Captcha challenge, the admin user&#39;s response to the Captcha challenge, and the admin user&#39;s email address. (Specified in body).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of complete messages.</li>
+                        <li>Schema: [<a href="#action">Action</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading GET">
+        <h2 class="panel-title GET-heading">GET /management/users/{userId}/activate 
+            <a data-toggle="collapse" data-target="#collapse-gPyb4FcquB"
+                href="#collapse-gPyb4FcquB" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-gPyb4FcquB" class="panel-body collapse">
+
+        <p>Activate an admin user from a link provIded in an email notification.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>userId</b> (string) <br>
+                    One of the user&#39;s identification which includes username, real name, email address or UUID. (Specified in path).
+                </li>
+                <li>
+                    <b>token</b> () <br>
+                    Activation token&#39;s query statement. (Specified in query).
+                </li>
+                <li>
+                    <b>confirm_email</b> () <br>
+                    Query statement of whether send confimation email or not. (Specified in query).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of complete messages.</li>
+                        <li>Schema: [<a href="#action">Action</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading PUT">
+        <h2 class="panel-title PUT-heading">PUT /management/users/{userId}/password 
+            <a data-toggle="collapse" data-target="#collapse-eOkQcznynD"
+                href="#collapse-eOkQcznynD" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-eOkQcznynD" class="panel-body collapse">
+
+        <p>Update an admin user&#39;s password through getting the newpassword and the old one for identification.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>userId</b> (string) <br>
+                    One of the user&#39;s identification which includes username, real name, email address or UUID. (Specified in path).
+                </li>
+                <li>
+                    <b>ResetPW</b> (                    <a href="#resetpw">ResetPW</a>) <br>
+                    The user&#39;s old and new password. (Specified in body).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of complete messages.</li>
+                        <li>Schema: [<a href="#action">Action</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading GET">
+        <h2 class="panel-title GET-heading">GET /management/users/{userId}/reactivate 
+            <a data-toggle="collapse" data-target="#collapse-pxE50B5nCD"
+                href="#collapse-pxE50B5nCD" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-pxE50B5nCD" class="panel-body collapse">
+
+        <p>Reactivate an expired admin user.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>userId</b> (string) <br>
+                    One of the user&#39;s identification which includes username, real name, email address or UUID. (Specified in path).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of complete messages.</li>
+                        <li>Schema: [<a href="#action">Action</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading POST">
+        <h2 class="panel-title POST-heading">POST /{orgId}/{appId}/users/{user}/password 
+            <a data-toggle="collapse" data-target="#collapse-sOcj4VS4JA"
+                href="#collapse-sOcj4VS4JA" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-sOcj4VS4JA" class="panel-body collapse">
+
+        <p>Set a user&#39;s password or reset the user&#39;s existing password.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>appId</b> (string) <br>
+                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>username</b> (string) <br>
+                    The username of the user. (Specified in path).
+                </li>
+                <li>
+                    <b>ResetPW</b> (                    <a href="#resetpw">ResetPW</a>) <br>
+                    The user&#39;s old and new password. (Specified in body).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of complete messages.</li>
+                        <li>Schema: [<a href="#action">Action</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+<a name='ActivityFeed-method'></a>
+<h2>ActivityFeed Methods</h2>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading GET">
+        <h2 class="panel-title GET-heading">GET /management/orgs/{orgId}/feed 
+            <a data-toggle="collapse" data-target="#collapse-HkB3lyybM0"
+                href="#collapse-HkB3lyybM0" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-HkB3lyybM0" class="panel-body collapse">
+
+        <p>Retrieve an organization&#39;s activity feed.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of the organization&#39;s ActivityFeed.</li>
+                        <li>Schema: [<a href="#activityfeed">ActivityFeed</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading GET">
+        <h2 class="panel-title GET-heading">GET /management/users/{userId}/feed 
+            <a data-toggle="collapse" data-target="#collapse-trV5SjBRiv"
+                href="#collapse-trV5SjBRiv" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-trV5SjBRiv" class="panel-body collapse">
+
+        <p>Retrieve an admin user&#39;s activity feed.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>userId</b> (string) <br>
+                    One of the user&#39;s identification which includes username, real name, email address or UUID. (Specified in path).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of user&#39;s activity</li>
+                        <li>Schema: [<a href="#activityfeed">ActivityFeed</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading POST">
+        <h2 class="panel-title POST-heading">POST /{orgId}/{appId}/groups/{groupId}/activities 
+            <a data-toggle="collapse" data-target="#collapse-zj0yM6YokI"
+                href="#collapse-zj0yM6YokI" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-zj0yM6YokI" class="panel-body collapse">
+
+        <p>Create an activity to a specific group. In this case the activity is created in the activities collection and is accessible at the /activities endpoint to users who have the permission to read that endpoint. In addition, a relationship is established between the activity and the group, and because of that, the activity will appear in the group’s feed. The group &#39;owns&#39; the activity. Also, the activity will be published in the feed of all users that are members of the group.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>appId</b> (string) <br>
+                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>groupId</b> (string) <br>
+                    One of the group&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>CreateActivity</b> (                    <a href="#createactivity">CreateActivity</a>) <br>
+                    One or more sets of activity properties. (Specified in body).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of user&#39;s activity.</li>
+                        <li>Schema: [<a href="#activityfeed">ActivityFeed</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading GET">
+        <h2 class="panel-title GET-heading">GET /{orgId}/{appId}/groups/{groupId}/feed 
+            <a data-toggle="collapse" data-target="#collapse-gIeQmdnsDx"
+                href="#collapse-gIeQmdnsDx" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-gIeQmdnsDx" class="panel-body collapse">
+
+        <p>Get a group&#39;s feed through providing all the identifications.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>appId</b> (string) <br>
+                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>groupId</b> (string) <br>
+                    One of the group&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of group&#39;s activity.</li>
+                        <li>Schema: [<a href="#activityfeed">ActivityFeed</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading POST">
+        <h2 class="panel-title POST-heading">POST /{orgId}/{appId}/users/{userId}/activities 
+            <a data-toggle="collapse" data-target="#collapse-L2T56Ztybh"
+                href="#collapse-L2T56Ztybh" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-L2T56Ztybh" class="panel-body collapse">
+
+        <p>Create an activity in the activities collection.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>appId</b> (string) <br>
+                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>userId-3</b> (string) <br>
+                    One of the user&#39;s identification which includes username or UUID. (Specified in path).
+                </li>
+                <li>
+                    <b>CreateActivity</b> (                    <a href="#createactivity">CreateActivity</a>) <br>
+                    One or more sets of activity properties. (Specified in body).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of user&#39;s activity.</li>
+                        <li>Schema: [<a href="#activityfeed">ActivityFeed</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading GET">
+        <h2 class="panel-title GET-heading">GET /{orgId}/{appId}/users/{userId}/feed 
+            <a data-toggle="collapse" data-target="#collapse-q3sk3xVUu4"
+                href="#collapse-q3sk3xVUu4" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-q3sk3xVUu4" class="panel-body collapse">
+
+        <p>Retrieve a user&#39;s feed through providing all the identifications.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>appId</b> (string) <br>
+                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>userId-3</b> (string) <br>
+                    One of the user&#39;s identification which includes username or UUID. (Specified in path).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of user&#39;s activity feed.</li>
+                        <li>Schema: [<a href="#activityfeed">ActivityFeed</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+<a name='AppData-method'></a>
+<h2>AppData Methods</h2>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading GET">
+        <h2 class="panel-title GET-heading">GET /management/orgs/{orgId}/apps 
+            <a data-toggle="collapse" data-target="#collapse-2aQqcShABU"
+                href="#collapse-2aQqcShABU" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-2aQqcShABU" class="panel-body collapse">
+
+        <p>Retrieve the applications in an organization through providing both Id of application and organization.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of retrieved application data.</li>
+                        <li>Schema: [<a href="#appdata">AppData</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading DELETE">
+        <h2 class="panel-title DELETE-heading">DELETE /management/orgs/{orgId}/apps/{appId} 
+            <a data-toggle="collapse" data-target="#collapse-G319AhhnWy"
+                href="#collapse-G319AhhnWy" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-G319AhhnWy" class="panel-body collapse">
+
+        <p>Remove an application from an organization through providing both Id of application and organization.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>appId</b> (string) <br>
+                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of deleted application info.</li>
+                        <li>Schema: [<a href="#appdata">AppData</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+<a name='Credential-method'></a>
+<h2>Credential Methods</h2>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading GET">
+        <h2 class="panel-title GET-heading">GET /management/orgs/{orgId}/apps/{appId}/credentials 
+            <a data-toggle="collapse" data-target="#collapse-AASgKtaSkG"
+                href="#collapse-AASgKtaSkG" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-AASgKtaSkG" class="panel-body collapse">
+
+        <p>Retrieve the client Id and client secret credentials for an application in an organization.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>appId</b> (string) <br>
+                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of retrieved credentials info.</li>
+                        <li>Schema: [<a href="#credential">Credential</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading POST">
+        <h2 class="panel-title POST-heading">POST /management/orgs/{orgId}/apps/{appId}/credentials 
+            <a data-toggle="collapse" data-target="#collapse-dKcFwuUjzH"
+                href="#collapse-dKcFwuUjzH" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-dKcFwuUjzH" class="panel-body collapse">
+
+        <p>Generate the client Id and client secret credentials for an application in an organization.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>appId</b> (string) <br>
+                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of generated credentials info.</li>
+                        <li>Schema: [<a href="#credential">Credential</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading GET">
+        <h2 class="panel-title GET-heading">GET /management/orgs/{orgId}/credentials 
+            <a data-toggle="collapse" data-target="#collapse-ZMqkJ1AwIr"
+                href="#collapse-ZMqkJ1AwIr" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-ZMqkJ1AwIr" class="panel-body collapse">
+
+        <p>Retrieve the credentials for an organization client.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of Credential</li>
+                        <li>Schema: [<a href="#credential">Credential</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading POST">
+        <h2 class="panel-title POST-heading">POST /management/orgs/{orgId}/credentials 
+            <a data-toggle="collapse" data-target="#collapse-eG7QcoefBR"
+                href="#collapse-eG7QcoefBR" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-eG7QcoefBR" class="panel-body collapse">
+
+        <p>Generate whole new credentials for an organization client.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of Credential</li>
+                        <li>Schema: [<a href="#credential">Credential</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+<a name='Devices-method'></a>
+<h2>Devices Methods</h2>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading GET">
+        <h2 class="panel-title GET-heading">GET /{orgId}/{appId}/{notificationId}/*/queue 
+            <a data-toggle="collapse" data-target="#collapse-m94kArvzxi"
+                href="#collapse-m94kArvzxi" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-m94kArvzxi" class="panel-body collapse">
+
+        <p>Retrieve the list of devices associated with one or more notifications before the notifications are sent through providing all the identifications.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>appId</b> (string) <br>
+                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>notificationId</b> (string) <br>
+                    One of the notification&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of retrieved device&#39;s info.</li>
+                        <li>Schema: [<a href="#device">Device</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+<a name='Entity-method'></a>
+<h2>Entity Methods</h2>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading GET">
+        <h2 class="panel-title GET-heading">GET /{orgId}/{appId}/users/{userId}/{relation} 
+            <a data-toggle="collapse" data-target="#collapse-pIaAhJWMZp"
+                href="#collapse-pIaAhJWMZp" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-pIaAhJWMZp" class="panel-body collapse">
+
+        <p>Retrieve a user&#39;s collections or connections through query statement.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>appId</b> (string) <br>
+                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>userId-3</b> (string) <br>
+                    One of the user&#39;s identification which includes username or UUID. (Specified in path).
+                </li>
+                <li>
+                    <b>relation</b> (string) <br>
+                    The relation between user and collections. (Specified in path).
+                </li>
+                <li>
+                    <b>queryStatement</b> () <br>
+                    The query statement of the user. (Specified in query).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of user&#39;s collections info.</li>
+                        <li>Schema: [<a href="#entity">Entity</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading GET">
+        <h2 class="panel-title GET-heading">GET /{orgId}/{appId}/{collectionId} 
+            <a data-toggle="collapse" data-target="#collapse-xW56KedRyq"
+                href="#collapse-xW56KedRyq" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-xW56KedRyq" class="panel-body collapse">
+
+        <p>Retrieve collection through query statement.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>appId</b> (string) <br>
+                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>collectionId</b> (string) <br>
+                    One of the collection&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>queryStatement</b> () <br>
+                    Any values specified in the query statement should be enclosed in single-quotes. (Specified in query).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of retrieved collection&#39;s info.</li>
+                        <li>Schema: [<a href="#entity">Entity</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading PUT">
+        <h2 class="panel-title PUT-heading">PUT /{orgId}/{appId}/{collectionId} 
+            <a data-toggle="collapse" data-target="#collapse-Zy8ncQAeme"
+                href="#collapse-Zy8ncQAeme" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-Zy8ncQAeme" class="panel-body collapse">
+
+        <p>Update collection through query statement.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>appId</b> (string) <br>
+                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>collectionId</b> (string) <br>
+                    One of the collection&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>queryStatement</b> () <br>
+                    Any values specified in the query statement should be enclosed in single-quotes. (Specified in query).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of updated collection&#39;s info.</li>
+                        <li>Schema: [<a href="#entity">Entity</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading POST">
+        <h2 class="panel-title POST-heading">POST /{orgId}/{appId}/{collectionId}/{entityId1}/{relation}/{entityId2} 
+            <a data-toggle="collapse" data-target="#collapse-ocB2PheyLp"
+                href="#collapse-ocB2PheyLp" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-ocB2PheyLp" class="panel-body collapse">
+
+        <p>Add an entity to a collection through providing all the identifications.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>appId</b> (string) <br>
+                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>collectionId</b> (string) <br>
+                    One of the collection&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>entityId1</b> (string) <br>
+                    The Id of the 1st entity. (Specified in path).
+                </li>
+                <li>
+                    <b>relation</b> (string) <br>
+                    The relation between 1st entity and 2nd entity. (Specified in path).
+                </li>
+                <li>
+                    <b>entityId2</b> (string) <br>
+                    The Id of the 2nd entity. (Specified in path).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of added entity&#39;s info.</li>
+                        <li>Schema: [<a href="#entity">Entity</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading DELETE">
+        <h2 class="panel-title DELETE-heading">DELETE /{orgId}/{appId}/{collectionId}/{entityId1}/{relation}/{entityId2} 
+            <a data-toggle="collapse" data-target="#collapse-5zFww1vFfs"
+                href="#collapse-5zFww1vFfs" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-5zFww1vFfs" class="panel-body collapse">
+
+        <p>Remove an entity from a collection through providing all the identifications.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>appId</b> (string) <br>
+                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>collectionId</b> (string) <br>
+                    One of the collection&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>entityId1</b> (string) <br>
+                    The Id of the 1st entity. (Specified in path).
+                </li>
+                <li>
+                    <b>relation</b> (string) <br>
+                    The relation between 1st entity and 2nd entity. (Specified in path).
+                </li>
+                <li>
+                    <b>entityId2</b> (string) <br>
+                    The Id of the 2nd entity. (Specified in path).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of deleted entity&#39;s info.</li>
+                        <li>Schema: [<a href="#entity">Entity</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading GET">
+        <h2 class="panel-title GET-heading">GET /{orgId}/{appId}/{collectionId}/{entityId} 
+            <a data-toggle="collapse" data-target="#collapse-1dov3vPnls"
+                href="#collapse-1dov3vPnls" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-1dov3vPnls" class="panel-body collapse">
+
+        <p>Retrieve an entity through providing Id of application, organization, collection and entity.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>appId</b> (string) <br>
+                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>collectionId</b> (string) <br>
+                    One of the collection&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>entityId</b> (string) <br>
+                    One of the entity&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of retrieved entity&#39;s info.</li>
+                        <li>Schema: [<a href="#entity">Entity</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading PUT">
+        <h2 class="panel-title PUT-heading">PUT /{orgId}/{appId}/{collectionId}/{entityId} 
+            <a data-toggle="collapse" data-target="#collapse-CMPoM2NkHk"
+                href="#collapse-CMPoM2NkHk" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-CMPoM2NkHk" class="panel-body collapse">
+
+        <p>One or more properties can be updated with a single request.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>appId</b> (string) <br>
+                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>collectionId</b> (string) <br>
+                    One of the collection&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>entityId</b> (string) <br>
+                    One of the entity&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>entityproperty</b> (                    <a href="#createentities">CreateEntities</a>) <br>
+                    The properties of the entity. (Specified in body).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of updated entity&#39;s info.</li>
+                        <li>Schema: [<a href="#entity">Entity</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading DELETE">
+        <h2 class="panel-title DELETE-heading">DELETE /{orgId}/{appId}/{collectionId}/{entityId} 
+            <a data-toggle="collapse" data-target="#collapse-Jg2pLwSrSu"
+                href="#collapse-Jg2pLwSrSu" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-Jg2pLwSrSu" class="panel-body collapse">
+
+        <p>Delete an entity from the collection.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>appId</b> (string) <br>
+                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>collectionId</b> (string) <br>
+                    One of the collection&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>entityId</b> (string) <br>
+                    One of the entity&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of deleted entity&#39;s info.</li>
+                        <li>Schema: [<a href="#entity">Entity</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading POST">
+        <h2 class="panel-title POST-heading">POST /{orgId}/{appId}/{entitytype} 
+            <a data-toggle="collapse" data-target="#collapse-o8OSLLkp41"
+                href="#collapse-o8OSLLkp41" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-o8OSLLkp41" class="panel-body collapse">
+
+        <p>When a new entity is created, Usergrid will automatically create a corresponding collection if one does not already exist. The collection will automatically be named with the plural form of the entity type. </p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>appId</b> (string) <br>
+                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>entitytype</b> (string) <br>
+                    The entity type to create. (Specified in path).
+                </li>
+                <li>
+                    <b>entityproperty</b> (                    <a href="#createentities">CreateEntities</a>) <br>
+                    The properties of the entity. (Specified in body).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of created custom entity&#39;s info.</li>
+                        <li>Schema: [<a href="#entity">Entity</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+<a name='Event-method'></a>
+<h2>Event Methods</h2>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading POST">
+        <h2 class="panel-title POST-heading">POST /{orgId}/{appId}/events 
+            <a data-toggle="collapse" data-target="#collapse-qnPBoA07vy"
+                href="#collapse-qnPBoA07vy" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-qnPBoA07vy" class="panel-body collapse">
+
+        <p>Create an event through providing both Id of organization and application.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>appId</b> (string) <br>
+                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>CreateEvent</b> (                    <a href="#createevent">CreateEvent</a>) <br>
+                    The required property of the event. (Specified in body).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of created event&#39;s info.</li>
+                        <li>Schema: [<a href="#event">Event</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+<a name='Group-method'></a>
+<h2>Group Methods</h2>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading POST">
+        <h2 class="panel-title POST-heading">POST /{orgId}/{appId}/groups 
+            <a data-toggle="collapse" data-target="#collapse-4qiW3TsSSu"
+                href="#collapse-4qiW3TsSSu" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-4qiW3TsSSu" class="panel-body collapse">
+
+        <p>Create a new group through providing both Id of organization and application.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>appId</b> (string) <br>
+                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>groupproperty</b> (                    <a href="#creategroup">CreateGroup</a>) <br>
+                    The property of the created group. (Specified in body).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of created group&#39;s info.</li>
+                        <li>Schema: [<a href="#group">Group</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading GET">
+        <h2 class="panel-title GET-heading">GET /{org_Id}/{app_Id}/groups/{groupId} 
+            <a data-toggle="collapse" data-target="#collapse-mh3TFMiqlw"
+                href="#collapse-mh3TFMiqlw" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-mh3TFMiqlw" class="panel-body collapse">
+
+        <p>Get a group through through providing all the identifications.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>appId</b> (string) <br>
+                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>groupId</b> (string) <br>
+                    One of the group&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of retrieved group&#39;s info.</li>
+                        <li>Schema: [<a href="#group">Group</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading PUT">
+        <h2 class="panel-title PUT-heading">PUT /{org_Id}/{app_Id}/groups/{groupId} 
+            <a data-toggle="collapse" data-target="#collapse-Ytvz84UP9Q"
+                href="#collapse-Ytvz84UP9Q" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-Ytvz84UP9Q" class="panel-body collapse">
+
+        <p>Update a group through providing all the identifications.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>appId</b> (string) <br>
+                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>groupId</b> (string) <br>
+                    One of the group&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of updated group&#39;s info.</li>
+                        <li>Schema: [<a href="#group">Group</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+<a name='Notification-method'></a>
+<h2>Notification Methods</h2>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading PUT">
+        <h2 class="panel-title PUT-heading">PUT /my-org/sandbox/notifications/{notificationId} 
+            <a data-toggle="collapse" data-target="#collapse-2X3BWwAy5v"
+                href="#collapse-2X3BWwAy5v" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-2X3BWwAy5v" class="panel-body collapse">
+
+        <p>Cancel sent notifications through providing the Id of the notification.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>notificationId</b> (string) <br>
+                    One of the notification&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>cancelMsg</b> (                    <a href="#cancelmsg">CancelMSG</a>) <br>
+                    Indicete whether is canceled or not. (Specified in body).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of canceled notification&#39;s info.</li>
+                        <li>Schema: [<a href="#notification">Notification</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading POST">
+        <h2 class="panel-title POST-heading">POST /{orgId}/{appId}/devices 
+            <a data-toggle="collapse" data-target="#collapse-oPXCIDKL6a"
+                href="#collapse-oPXCIDKL6a" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-oPXCIDKL6a" class="panel-body collapse">
+
+        <p>Create notifications for user through targeting by location and providing all the identifications.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>appId</b> (string) <br>
+                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>notification</b> (                    <a href="#createnotifications">CreateNotifications</a>) <br>
+                    These parameters are used when forming the notification portion of the request. (Specified in body).
+                </li>
+                <li>
+                    <b>scheduleNotification</b> (                    <a href="#schedulenotification">ScheduleNotification</a>) <br>
+                    To schedule a notification for a later time add the deliver parameter with a UNIX timestamp to the body of your request. (Specified in body).
+                </li>
+                <li>
+                    <b>setExpiration</b> (                    <a href="#setexpiration">SetExpiration</a>) <br>
+                    If a push service can&#39;t deliver a message to a device and needs to resend it you can set a notification to expire after a certain date/time. (Specified in body).
+                </li>
+                <li>
+                    <b>queryStatement</b> () <br>
+                    The query statement of the location of the user. (Specified in query).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of created notification&#39;s info.</li>
+                        <li>Schema: [<a href="#notification">Notification</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading POST">
+        <h2 class="panel-title POST-heading">POST /{orgId}/{appId}/devices/*/notifications 
+            <a data-toggle="collapse" data-target="#collapse-QHRHWLFRwh"
+                href="#collapse-QHRHWLFRwh" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-QHRHWLFRwh" class="panel-body collapse">
+
+        <p>Create notifications for all devices. This request will target all device entities.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>appId</b> (string) <br>
+                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>notification</b> (                    <a href="#createnotifications">CreateNotifications</a>) <br>
+                    These parameters are used when forming the notification portion of the request. (Specified in body).
+                </li>
+                <li>
+                    <b>scheduleNotification</b> (                    <a href="#schedulenotification">ScheduleNotification</a>) <br>
+                    To schedule a notification for a later time add the deliver parameter with a UNIX timestamp to the body of your request. (Specified in body).
+                </li>
+                <li>
+                    <b>setExpiration</b> (                    <a href="#setexpiration">SetExpiration</a>) <br>
+                    If a push service can&#39;t deliver a message to a device and needs to resend it you can set a notification to expire after a certain date/time. (Specified in body).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of created notification&#39;s info.</li>
+                        <li>Schema: [<a href="#notification">Notification</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading POST">
+        <h2 class="panel-title POST-heading">POST /{orgId}/{appId}/devices/{deviceId}/notifications 
+            <a data-toggle="collapse" data-target="#collapse-YK5TdQKJ4Z"
+                href="#collapse-YK5TdQKJ4Z" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-YK5TdQKJ4Z" class="panel-body collapse">
+
+        <p>Create notifications for a single device. This request will target a specific device entity.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>appId</b> (string) <br>
+                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>deviceId</b> (string) <br>
+                    One of the device&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>notification</b> (                    <a href="#createnotifications">CreateNotifications</a>) <br>
+                    These parameters are used when forming the notification portion of the request. (Specified in body).
+                </li>
+                <li>
+                    <b>scheduleNotification</b> (                    <a href="#schedulenotification">ScheduleNotification</a>) <br>
+                    To schedule a notification for a later time add the deliver parameter with a UNIX timestamp to the body of your request. (Specified in body).
+                </li>
+                <li>
+                    <b>setExpiration</b> (                    <a href="#setexpiration">SetExpiration</a>) <br>
+                    If a push service can&#39;t deliver a message to a device and needs to resend it you can set a notification to expire after a certain date/time. (Specified in body).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of created notification&#39;s info.</li>
+                        <li>Schema: [<a href="#notification">Notification</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading POST">
+        <h2 class="panel-title POST-heading">POST /{orgId}/{appId}/groups/{path}/notifications 
+            <a data-toggle="collapse" data-target="#collapse-ygcIRQJpNR"
+                href="#collapse-ygcIRQJpNR" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-ygcIRQJpNR" class="panel-body collapse">
+
+        <p>Create notifications for a group. This request will target all users associated with a specific group entity.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>appId</b> (string) <br>
+                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>path</b> (string) <br>
+                    The path of the group. (Specified in path).
+                </li>
+                <li>
+                    <b>notification</b> (                    <a href="#createnotifications">CreateNotifications</a>) <br>
+                    These parameters are used when forming the notification portion of the request. (Specified in body).
+                </li>
+                <li>
+                    <b>scheduleNotification</b> (                    <a href="#schedulenotification">ScheduleNotification</a>) <br>
+                    To schedule a notification for a later time add the deliver parameter with a UNIX timestamp to the body of your request. (Specified in body).
+                </li>
+                <li>
+                    <b>setExpiration</b> (                    <a href="#setexpiration">SetExpiration</a>) <br>
+                    If a push service can&#39;t deliver a message to a device and needs to resend it you can set a notification to expire after a certain date/time. (Specified in body).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of created notification&#39;s info.</li>
+                        <li>Schema: [<a href="#notification">Notification</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading GET">
+        <h2 class="panel-title GET-heading">GET /{orgId}/{appId}/notifications 
+            <a data-toggle="collapse" data-target="#collapse-dapPIY8Bor"
+                href="#collapse-dapPIY8Bor" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-dapPIY8Bor" class="panel-body collapse">
+
+        <p>Retrieve one or more notifications through providing all the identifications.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>appId</b> (string) <br>
+                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of retrieved notification&#39;s info.</li>
+                        <li>Schema: [<a href="#notification">Notification</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading DELETE">
+        <h2 class="panel-title DELETE-heading">DELETE /{orgId}/{appId}/notifications/{notificationId} 
+            <a data-toggle="collapse" data-target="#collapse-Ewtulp8IFk"
+                href="#collapse-Ewtulp8IFk" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-Ewtulp8IFk" class="panel-body collapse">
+
+        <p>Remove unsent notifications through providing all the identifications.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>appId</b> (string) <br>
+                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>notificationId</b> (string) <br>
+                    One of the notification&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of deleted notification&#39;s info.</li>
+                        <li>Schema: [<a href="#notification">Notification</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading POST">
+        <h2 class="panel-title POST-heading">POST /{orgId}/{appId}/users/{userId}/notifications 
+            <a data-toggle="collapse" data-target="#collapse-iuRATGDSDn"
+                href="#collapse-iuRATGDSDn" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-iuRATGDSDn" class="panel-body collapse">
+
+        <p>Create notifications for a user. This request will target a specific user entity.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>appId</b> (string) <br>
+                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>userId-3</b> (string) <br>
+                    One of the user&#39;s identification which includes username or UUID. (Specified in path).
+                </li>
+                <li>
+                    <b>notification</b> (                    <a href="#createnotifications">CreateNotifications</a>) <br>
+                    These parameters are used when forming the notification portion of the request. (Specified in body).
+                </li>
+                <li>
+                    <b>scheduleNotification</b> (                    <a href="#schedulenotification">ScheduleNotification</a>) <br>
+                    To schedule a notification for a later time add the deliver parameter with a UNIX timestamp to the body of your request. (Specified in body).
+                </li>
+                <li>
+                    <b>setExpiration</b> (                    <a href="#setexpiration">SetExpiration</a>) <br>
+                    If a push service can&#39;t deliver a message to a device and needs to resend it you can set a notification to expire after a certain date/time. (Specified in body).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of created notification&#39;s info.</li>
+                        <li>Schema: [<a href="#notification">Notification</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading GET">
+        <h2 class="panel-title GET-heading">GET /{orgId}/{appId}/{receiptId}/*/notifications 
+            <a data-toggle="collapse" data-target="#collapse-MVtYUm9Thh"
+                href="#collapse-MVtYUm9Thh" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-MVtYUm9Thh" class="panel-body collapse">
+
+        <p>Retrieve notifications associated with one or more receipts through providing all the identifications.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>appId</b> (string) <br>
+                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>receiptId</b> (string) <br>
+                    One of the receipt&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of retrieved notification&#39;s info.</li>
+                        <li>Schema: [<a href="#notification">Notification</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+<a name='Organization-method'></a>
+<h2>Organization Methods</h2>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading POST">
+        <h2 class="panel-title POST-heading">POST /management/orgs 
+            <a data-toggle="collapse" data-target="#collapse-vUb9W088QZ"
+                href="#collapse-vUb9W088QZ" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-vUb9W088QZ" class="panel-body collapse">
+
+        <p>Create an organization through a form post.</p>
+
+        <h3>Parameters</h3>
+
+        <ul>
+                <li>
+                    <b>CreateOrg</b> (                    <a href="#createorg">CreateOrg</a>) <br>
+                    A set of organization properties supplied through a form. (Specified in body).
+                </li>
+        </ul>
+
+        <h3>Responses</h3>
+
+        <ul>
+                <li>
+                    <b>200</b>
+                    <ul>
+                        <li>Description: An array of created Organization.</li>
+                        <li>Schema: [<a href="#organization">Organization</a>]</li>
+                    </ul>
+                </li>
+                <li>
+                    <b>default</b>
+                    <ul>
+                        <li>Description: Unexpected error.</li>
+                        <li>Schema: [<a href="#error">Error</a>]</li>
+                    </ul>
+                </li>
+        </ul>     
+        
+    </div>
+    <!--<div class="panel-footer"></div>-->
+</div>
+
+<div class="panel panel-default">
+    
+    <div class="panel-heading GET">
+        <h2 class="panel-title GET-heading">GET /management/orgs/{orgId} 
+            <a data-toggle="collapse" data-target="#collapse-cwUcW5lEAU"
+                href="#collapse-cwUcW5lEAU" class="collapsed collapse-button"> </a>
+        </h2>
+    </div>
+    
+    <div id="collapse-cwUcW5lEAU" class="panel-body collapse">
+
+        <p>Retrieve an organ

<TRUNCATED>

[04/60] [abbrv] incubator-usergrid git commit: cherry picking docs from master

[sn...@apache.org]

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/user-management/messagee-example.html
----------------------------------------------------------------------
diff --git a/content/docs/user-management/messagee-example.html b/content/docs/user-management/messagee-example.html
new file mode 100644
index 0000000..fa24fbd
--- /dev/null
+++ b/content/docs/user-management/messagee-example.html
@@ -0,0 +1,485 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>App Example - Messagee &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+        <link rel="next" title="Geolocating your Entities" href="../geolocation/geolocation.html"/>
+        <link rel="prev" title="Social Graph Connections" href="user-connections.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">App Example - Messagee</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#creating-a-user-account-in-usergrid">Creating a user account in Usergrid</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#creating-an-app-and-users">Creating an app and users</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#step-1">STEP 1</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#step-2">STEP 2</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#step-3">STEP 3</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#step-4">STEP 4</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#step-5">STEP 5</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#ios-client">iOS client</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#step-6">STEP 6</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#step-7">STEP 7</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#step-8">STEP 8</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#step-9">STEP 9</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#step-10">STEP 10</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#step-11">STEP 11</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#step-12">STEP 12</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id1">STEP 6</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#ios-sdk">iOS SDK</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#android-client-and-sdk">Android client and SDK</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#javascript-html5-client-and-sdk">Javascript/HTML5 client and SDK</a></li>
+</ul>
+</li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>App Example - Messagee</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/user-management/messagee-example.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="app-example-messagee">
+<h1>App Example - Messagee<a class="headerlink" href="#app-example-messagee" title="Permalink to this headline">¶</a></h1>
+<p>Messagee is a simple Twitter-style messaging application that leverages
+the extensive functionality of Usergrid. This section describes some of
+the features of Messagee.</p>
+<p>There are three client versions of Messagee:</p>
+<ul class="simple">
+<li><a class="reference external" href="https://github.com/apigee/usergrid-sample-ios-messagee">An iOS client
+version</a></li>
+<li><a class="reference external" href="https://github.com/apigee/usergrid-sample-android-messagee">An Android client
+version</a></li>
+<li><a class="reference external" href="https://github.com/apigee/usergrid-sample-html5-messagee">An HTML5
+client</a></li>
+</ul>
+<p>The sections below describe how to create a new app, enter some test
+users, and run the app. You also learn how to use the Usergrid admin
+portal, a user interface that streamlines data and application
+management in the Usergrid system. The portal is also a reference
+application that shows how to incorporate Usergrid APIs with JavaScript.
+For a more detailed discussion of the portal&#8217;s functionality, see Admin
+portal.</p>
+<div class="section" id="creating-a-user-account-in-usergrid">
+<h2>Creating a user account in Usergrid<a class="headerlink" href="#creating-a-user-account-in-usergrid" title="Permalink to this headline">¶</a></h2>
+<p>Go to the Usergrid portal and login. If you are new to Usergrid, sign up
+for an account, specifying an organization (e.g., the name of your
+company or project team) and a username and password that you can use to
+authenticate. Because Usergrid are designed for use by development
+teams, the same username can be associated with one or more
+organizations.</p>
+<p>If you create a new account, you receive a confirmation email that
+contains a URL that you must click to activate the account. After this,
+simply log in to the portal with your username and password.</p>
+<img alt="../_images/login.png" src="../_images/login.png" />
+</div>
+<div class="section" id="creating-an-app-and-users">
+<h2>Creating an app and users<a class="headerlink" href="#creating-an-app-and-users" title="Permalink to this headline">¶</a></h2>
+<p>When you have logged in, you need to create a new application.</p>
+<img alt="../_images/portal1.png" src="../_images/portal1.png" />
+<div class="section" id="step-1">
+<h3>STEP 1<a class="headerlink" href="#step-1" title="Permalink to this headline">¶</a></h3>
+<p>Enter a unique application name. The name must be unique to avoid a
+conflict with another user running the same application.</p>
+<img alt="../_images/portal2.png" src="../_images/portal2.png" />
+</div>
+<div class="section" id="step-2">
+<h3>STEP 2<a class="headerlink" href="#step-2" title="Permalink to this headline">¶</a></h3>
+<p>Make sure that the portal shows the application name you entered as the
+active application beneath the Applications menu (1).</p>
+<p>If the correct name is not displayed, click the menu and select your
+application. Next, you need to populate a test user user-test-1 that is
+going to log in to your copy of the server-side Messagee app.</p>
+</div>
+<div class="section" id="step-3">
+<h3>STEP 3<a class="headerlink" href="#step-3" title="Permalink to this headline">¶</a></h3>
+<p>Click the Users box on the left side of the console (2).</p>
+<img alt="../_images/portal3.png" src="../_images/portal3.png" />
+</div>
+<div class="section" id="step-4">
+<h3>STEP 4<a class="headerlink" href="#step-4" title="Permalink to this headline">¶</a></h3>
+<p>Click the Add button and enter the user information for your application
+in the pop-up window (be sure to create a password you can remember),
+and then click the Create button. Repeat these steps to create a second
+username test-user-2.</p>
+<img alt="../_images/portal4.png" src="../_images/portal4.png" />
+</div>
+<div class="section" id="step-5">
+<h3>STEP 5<a class="headerlink" href="#step-5" title="Permalink to this headline">¶</a></h3>
+<p>When you have finished all these steps, you have a new application and
+two new users.</p>
+<img alt="../_images/portal5.png" src="../_images/portal5.png" />
+<p>Now that you have created a uniquely named copy of the Messagee
+application as well as two user accounts (test-user-1 and test-user-2),
+you are ready to test out the Messagee app. Use test-user-1 to log in to
+the app, and test-user-2 as the user to follow.</p>
+<p>To continue with the example, follow the instructions for a client app
+(iOS client, Android client, or HTML5 client).</p>
+</div>
+</div>
+<div class="section" id="ios-client">
+<h2>iOS client<a class="headerlink" href="#ios-client" title="Permalink to this headline">¶</a></h2>
+<p>Messagee is available as an iPhone app that uses Usergrid and RestKit.
+The source for the iOS version of Messagee is available in the
+/samples/messagee directory of the Usergrid iOS SDK</p>
+<p>Here are the steps to run the Messagee app on iOS:</p>
+<div class="section" id="step-6">
+<h3>STEP 6<a class="headerlink" href="#step-6" title="Permalink to this headline">¶</a></h3>
+<p>Run Steps 1-5 under Creating an app and users. These steps create a
+unique instance of the Messagee app on the server and two test users,
+test-user-1 and test-user-2.</p>
+</div>
+<div class="section" id="step-7">
+<h3>STEP 7<a class="headerlink" href="#step-7" title="Permalink to this headline">¶</a></h3>
+<p>Access the Messagee server app by typing a URL similar to the following
+into your iOS mobile client (replace with the unique name of your
+application): <a class="reference external" href="https://api.usergrid.com//index.html">https://api.usergrid.com//index.html</a></p>
+<img alt="../_images/iOS1chooseapp.jpg" src="../_images/iOS1chooseapp.jpg" />
+</div>
+<div class="section" id="step-8">
+<h3>STEP 8<a class="headerlink" href="#step-8" title="Permalink to this headline">¶</a></h3>
+<p>On the mobile client, complete the registration information and click
+Register.</p>
+<img alt="../_images/iOS2register.jpg" src="../_images/iOS2register.jpg" />
+</div>
+<div class="section" id="step-9">
+<h3>STEP 9<a class="headerlink" href="#step-9" title="Permalink to this headline">¶</a></h3>
+<p>Log in to the Messagee app by entering the test-user-1 account
+information created previously, and click the Sign in button.</p>
+<img alt="user-management/iOS3signin.jpg" src="user-management/iOS3signin.jpg" />
+</div>
+<div class="section" id="step-10">
+<h3>STEP 10<a class="headerlink" href="#step-10" title="Permalink to this headline">¶</a></h3>
+<p>At this point, the message board is empty:</p>
+<img alt="../_images/iOS5emptyfeed.jpg" src="../_images/iOS5emptyfeed.jpg" />
+</div>
+<div class="section" id="step-11">
+<h3>STEP 11<a class="headerlink" href="#step-11" title="Permalink to this headline">¶</a></h3>
+<p>To post a message using the app, click the top-right icon in the message
+board to create a message, write the message text, and send it by
+clicking Post.</p>
+<img alt="../_images/iOS6newmsg.jpg" src="../_images/iOS6newmsg.jpg" />
+<p>Note: The posted message should appear in the message board within few
+seconds.</p>
+<img alt="../_images/iOS7feed1msg.jpg" src="../_images/iOS7feed1msg.jpg" />
+</div>
+<div class="section" id="step-12">
+<h3>STEP 12<a class="headerlink" href="#step-12" title="Permalink to this headline">¶</a></h3>
+<p>For your instance of the Messagee application to act like Twitter, you
+need to &#8220;follow&#8221; another user.</p>
+<p>In the message board, click Add People and add test-user-2 as a person
+that test-user-1 follows.</p>
+<img alt="user-management/iOS9followme.jpg" src="user-management/iOS9followme.jpg" />
+</div>
+<div class="section" id="id1">
+<h3>STEP 6<a class="headerlink" href="#id1" title="Permalink to this headline">¶</a></h3>
+<p>Log in as test-user-2 and post a message as this user to the message
+board.</p>
+<p>Go back and log in as user test-user-1. Because test-user-1 follows
+test-user-2, you should see the message sent by test-user-2 in the
+message board.</p>
+<img alt="../_images/iOS10seeusermsg.jpg" src="../_images/iOS10seeusermsg.jpg" />
+</div>
+</div>
+<div class="section" id="ios-sdk">
+<h2>iOS SDK<a class="headerlink" href="#ios-sdk" title="Permalink to this headline">¶</a></h2>
+<p>If you want to write iOS applications that connect to Usergrid,
+<a class="reference external" href="https://github.com/apache/incubator-usergrid/tree/master/sdks/ios">download the Usergrid iOS
+SDK</a>.</p>
+<p><strong>Note</strong>: The Messagee iOS application uses RestKit, a popular REST
+framework for iOS, to communicate with Usergrid. Because Usergrid use a
+REST API, you can use any REST framework to talk with the service.
+However, the official Usergrid iOS SDK provides a more convenient
+communication mechanism that you should use unless you&#8217;re already using
+RestKit or some other framework in your project.</p>
+</div>
+<div class="section" id="android-client-and-sdk">
+<h2>Android client and SDK<a class="headerlink" href="#android-client-and-sdk" title="Permalink to this headline">¶</a></h2>
+<p>Messagee is available as a sample Android app that acts as a Usergrid
+client. The source for the Android version is packaged with the Usergrid
+Android SDK in the /samples/messagee directory.</p>
+<p><a class="reference external" href="https://github.com/apache/incubator-usergrid/tree/master/sdks/android">Download the Usergrid Android
+SDK</a></p>
+</div>
+<div class="section" id="javascript-html5-client-and-sdk">
+<h2>Javascript/HTML5 client and SDK<a class="headerlink" href="#javascript-html5-client-and-sdk" title="Permalink to this headline">¶</a></h2>
+<p>Messagee is also available as a sample HTML5 app that behaves in much
+the same way as the two previous examples. The source for the HTML5
+version is packaged with the Usergrid Javascript/HTML5 SDK in the
+/samples/messagee directory.</p>
+<p><a class="reference external" href="https://github.com/apache/incubator-usergrid/tree/master/sdks/html5-javascript">Download the Usergrid Javascript/HTML5
+SDK</a></p>
+</div>
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+      
+        <a href="../geolocation/geolocation.html" class="btn btn-neutral float-right" title="Geolocating your Entities" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+      
+      
+        <a href="user-connections.html" class="btn btn-neutral" title="Social Graph Connections" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+      
+    </div>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/user-management/user-connections.html
----------------------------------------------------------------------
diff --git a/content/docs/user-management/user-connections.html b/content/docs/user-management/user-connections.html
new file mode 100644
index 0000000..a743066
--- /dev/null
+++ b/content/docs/user-management/user-connections.html
@@ -0,0 +1,358 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>Social Graph Connections &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+        <link rel="next" title="App Example - Messagee" href="messagee-example.html"/>
+        <link rel="prev" title="Activity" href="activity.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="activity.html">Activity</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">Social Graph Connections</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#following-followers">Following/followers</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#creating-a-following-followers-connection">Creating a following/followers connection</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>Social Graph Connections</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/user-management/user-connections.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="social-graph-connections">
+<h1>Social Graph Connections<a class="headerlink" href="#social-graph-connections" title="Permalink to this headline">¶</a></h1>
+<p>One of the most useful features of Usergrid is the ability to create
+connections between entities, which allow you to model arbitrary
+relationships between entities. This feature is particularly powerful
+when applied to user entities by allowing you to model complex social
+graphs between users as well as groups of users.</p>
+<div class="section" id="following-followers">
+<h2>Following/followers<a class="headerlink" href="#following-followers" title="Permalink to this headline">¶</a></h2>
+<p>To make the social graph possibilities of entity connections even easier
+to achieve, Usergrid also has special support for a default
+following/followers relationship, which offers these additional
+features:</p>
+<p>Reciprocal connection: If a following connection is made between a user
+and another user, a reciprocal followers relationship will be created
+automatically. In contrast, all of other entity connections are one-way,
+meaning any reciprocal relationship must be created manually.</p>
+<p>Activity feed subscription: The followed user&#8217;s activities will
+automatically be posted to the following user&#8217;s activity feed. For
+example, if Arthur is following Ford, then any activities published by
+Ford that Arthur is allowed to see will appear in Arthur&#8217;s activity
+feed.</p>
+</div>
+<div class="section" id="creating-a-following-followers-connection">
+<h2>Creating a following/followers connection<a class="headerlink" href="#creating-a-following-followers-connection" title="Permalink to this headline">¶</a></h2>
+<p>To create a following/followers connection between two entities, create
+the connection as you would any generic entity connection. For full
+details on creating connections, see <a class="reference external" href="../entity-connections/connecting-entities.html">Connecting
+entities</a>.</p>
+<p>For example, the following request would create a following/followers
+relationship between two user entities with the usernames &#8216;Fred&#8217; and
+&#8216;Barney&#8217;:</p>
+<div class="highlight-python"><div class="highlight"><pre>POST https://api.usergrid.com/your-org/your-app/users/barney/following/users/fred
+</pre></div>
+</div>
+<div class="admonition note"> <p class="first admonition-title"><p>Note</p>
+</p> <p class="last"><p>Please note that this only works when you <code class="docutils literal"><span class="pre">POST</span></code> a <code class="docutils literal"><span class="pre">following</span></code>
+connection. Creating a follower connection would not create a reciprocal
+following connection.</p>
+</p></div><p>This would retrieve a list of the users that Barney is following:</p>
+<div class="highlight-python"><div class="highlight"><pre>GET https://api.usergrid.com/your-org/your-app/users/barney/following
+</pre></div>
+</div>
+<p>And this would retrieve a list of users that are following Fred:</p>
+<div class="highlight-python"><div class="highlight"><pre>GET https://api.usergrid.com/your-org/your-app/users/fred/followers
+</pre></div>
+</div>
+</div>
+</div>
+<div class="section" id="creating-other-connections">
+<h1>Creating other connections<a class="headerlink" href="#creating-other-connections" title="Permalink to this headline">¶</a></h1>
+<p>You can extend this connection structure to create connections using any
+relationship. For example, you could use likes to denote a connection
+between a user and his dog with this POST:</p>
+<div class="highlight-python"><div class="highlight"><pre>POST https://api.usergrid.com/your-org/your-app/users/Fred/likes/dogs/Dino
+</pre></div>
+</div>
+<p>Note that in this case a reciprocal connection is not automatically
+created. To do so you would need to manually create the reciprocal
+connection with another POST such as:</p>
+<div class="highlight-python"><div class="highlight"><pre>POST https://api.usergrid.com/your-org/your-app/dogs/Dino/liked_by/users/Fred
+</pre></div>
+</div>
+<p>For more information on using entity connections, see <a class="reference external" href="../entity-connections/connecting-entities.html">Connecting
+entities</a>.</p>
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+      
+        <a href="messagee-example.html" class="btn btn-neutral float-right" title="App Example - Messagee" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+      
+      
+        <a href="activity.html" class="btn btn-neutral" title="Activity" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+      
+    </div>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/user-management/user-management.html
----------------------------------------------------------------------
diff --git a/content/docs/user-management/user-management.html b/content/docs/user-management/user-management.html
new file mode 100644
index 0000000..e74d5dc
--- /dev/null
+++ b/content/docs/user-management/user-management.html
@@ -0,0 +1,372 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>User management &amp; social graph &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+        <link rel="next" title="Working with User Data" href="working-user-data.html"/>
+        <link rel="prev" title="Security best practices" href="../security-and-auth/securing-your-app.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul class="current">
+<li class="toctree-l1 current"><a class="current reference internal" href="">User management &amp; social graph</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#user-management">User management</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#group-management">Group management</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#social-connections">Social connections</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#activity-feeds">Activity feeds</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>User management &amp; social graph</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/user-management/user-management.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="user-management-social-graph">
+<h1>User management &amp; social graph<a class="headerlink" href="#user-management-social-graph" title="Permalink to this headline">¶</a></h1>
+<p>Whether you&#8217;re developing apps for mobile or the Web, it&#8217;s almost
+certain that you will need to be able to handle user management, as well
+as offer the types of social features users have come to expect from a
+rich app experience. Usergrid makes all of this easy with default entity
+types and functionality available right out of the box. From user
+registration and profiles to login and authentication to activity feeds
+and social graph, you can create a social experience quickly and easily
+with just a few types of API calls.</p>
+<div class="section" id="user-management">
+<h2>User management<a class="headerlink" href="#user-management" title="Permalink to this headline">¶</a></h2>
+<p>The default user entity in Usergrid is designed to model app users,
+meaning registering users and managing their profiles is as simple as
+sending and updating JSON via the API. Used in conjunction with our
+available social graph, as well as our OAuth 2.0 authentication and
+token authorization features, you have all the tools you need to manage
+your user base.</p>
+<p>Learn more about:</p>
+<ul class="simple">
+<li><a class="reference external" href="user-management.html">User management</a></li>
+<li><a class="reference external" href="../security-and-auth/app-security.html">Authentication &amp; tokens</a></li>
+<li><a class="reference external" href="../security-and-auth/using-permissions.html">Permissions and
+roles</a></li>
+</ul>
+</div>
+<div class="section" id="group-management">
+<h2>Group management<a class="headerlink" href="#group-management" title="Permalink to this headline">¶</a></h2>
+<p>One of the most basic social features of any app is the ability to
+create groups of users to limit shared access to user or other app data.
+The default group entity in Usergrid was designed for this exact
+purpose. Associate a user with as many groups or sub-groups as you need,
+then apply permissions or roles to define shared access to Usergrid
+data.</p>
+<p>Learn more about:</p>
+<ul class="simple">
+<li><a class="reference external" href="group.md">Group management</a></li>
+<li><a class="reference external" href="../security-and-auth/using-permissions.html">Permissions and
+roles</a></li>
+</ul>
+</div>
+<div class="section" id="social-connections">
+<h2>Social connections<a class="headerlink" href="#social-connections" title="Permalink to this headline">¶</a></h2>
+<p>To create a rich social graph, your app needs to be able to create
+connections between users. Usergrid makes this process lightweight by
+allowing you to create social connections and generic entity connections
+between users to model relationships by working with simple URI paths.</p>
+<p>For example, you could create a &#8216;likes&#8217; relationship between two users
+with a POST:</p>
+<div class="highlight-python"><div class="highlight"><pre>https://api.usergrid.com/your-org/your-app/users/Arthur/likes/users/Ford
+</pre></div>
+</div>
+<p>You could then retrieve all the users Arthur &#8216;likes&#8217; with a GET to
+populate a list in your UI:</p>
+<div class="highlight-python"><div class="highlight"><pre>https://api.usergrid.com/your-org/your-app/users/Arthur/likes
+</pre></div>
+</div>
+<p>Learn more about:</p>
+<ul class="simple">
+<li><a class="reference external" href="user-connections.html">Social connections</a></li>
+<li><a class="reference external" href="../data-storage/relationship.html">Generic entity connections</a></li>
+</ul>
+</div>
+<div class="section" id="activity-feeds">
+<h2>Activity feeds<a class="headerlink" href="#activity-feeds" title="Permalink to this headline">¶</a></h2>
+<p>Activity feeds can be an essential way of establishing a social
+dimension of your user experience. Allow users to actively publish
+activities, such as status messages, or have your application code
+passively publish activities based on user actions, such as posting a
+photo. Activity feeds can be created and shared at both the user and
+group level, giving you the flexibility to present activity feeds that
+are most relevant to your users.</p>
+<p>Learn more about:</p>
+<ul class="simple">
+<li><a class="reference external" href="#activity-feeds">Activity feeds</a></li>
+</ul>
+</div>
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+      
+        <a href="working-user-data.html" class="btn btn-neutral float-right" title="Working with User Data" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+      
+      
+        <a href="../security-and-auth/securing-your-app.html" class="btn btn-neutral" title="Security best practices" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+      
+    </div>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

[27/60] [abbrv] incubator-usergrid git commit: cherry picking docs from master

[sn...@apache.org]

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_static/js/modernizr.min.js
----------------------------------------------------------------------
diff --git a/content/docs/_static/js/modernizr.min.js b/content/docs/_static/js/modernizr.min.js
new file mode 100644
index 0000000..f65d479
--- /dev/null
+++ b/content/docs/_static/js/modernizr.min.js
@@ -0,0 +1,4 @@
+/* Modernizr 2.6.2 (Custom Build) | MIT & BSD
+ * Build: http://modernizr.com/download/#-fontface-backgroundsize-borderimage-borderradius-boxshadow-flexbox-hsla-multiplebgs-opacity-rgba-textshadow-cssanimations-csscolumns-generatedcontent-cssgradients-cssreflections-csstransforms-csstransforms3d-csstransitions-applicationcache-canvas-canvastext-draganddrop-hashchange-history-audio-video-indexeddb-input-inputtypes-localstorage-postmessage-sessionstorage-websockets-websqldatabase-webworkers-geolocation-inlinesvg-smil-svg-svgclippaths-touch-webgl-shiv-mq-cssclasses-addtest-prefixed-teststyles-testprop-testallprops-hasevent-prefixes-domprefixes-load
+ */
+;window.Modernizr=function(a,b,c){function D(a){j.cssText=a}function E(a,b){return D(n.join(a+";")+(b||""))}function F(a,b){return typeof a===b}function G(a,b){return!!~(""+a).indexOf(b)}function H(a,b){for(var d in a){var e=a[d];if(!G(e,"-")&&j[e]!==c)return b=="pfx"?e:!0}return!1}function I(a,b,d){for(var e in a){var f=b[a[e]];if(f!==c)return d===!1?a[e]:F(f,"function")?f.bind(d||b):f}return!1}function J(a,b,c){var d=a.charAt(0).toUpperCase()+a.slice(1),e=(a+" "+p.join(d+" ")+d).split(" ");return F(b,"string")||F(b,"undefined")?H(e,b):(e=(a+" "+q.join(d+" ")+d).split(" "),I(e,b,c))}function K(){e.input=function(c){for(var d=0,e=c.length;d<e;d++)u[c[d]]=c[d]in k;return u.list&&(u.list=!!b.createElement("datalist")&&!!a.HTMLDataListElement),u}("autocomplete autofocus list placeholder max min multiple pattern required step".split(" ")),e.inputtypes=function(a){for(var d=0,e,f,h,i=a.length;d<i;d++)k.setAttribute("type",f=a[d]),e=k.type!=="text",e&&(k.value=l,k.style.cssText="position:
 absolute;visibility:hidden;",/^range$/.test(f)&&k.style.WebkitAppearance!==c?(g.appendChild(k),h=b.defaultView,e=h.getComputedStyle&&h.getComputedStyle(k,null).WebkitAppearance!=="textfield"&&k.offsetHeight!==0,g.removeChild(k)):/^(search|tel)$/.test(f)||(/^(url|email)$/.test(f)?e=k.checkValidity&&k.checkValidity()===!1:e=k.value!=l)),t[a[d]]=!!e;return t}("search tel url email datetime date month week time datetime-local number range color".split(" "))}var d="2.6.2",e={},f=!0,g=b.documentElement,h="modernizr",i=b.createElement(h),j=i.style,k=b.createElement("input"),l=":)",m={}.toString,n=" -webkit- -moz- -o- -ms- ".split(" "),o="Webkit Moz O ms",p=o.split(" "),q=o.toLowerCase().split(" "),r={svg:"http://www.w3.org/2000/svg"},s={},t={},u={},v=[],w=v.slice,x,y=function(a,c,d,e){var f,i,j,k,l=b.createElement("div"),m=b.body,n=m||b.createElement("body");if(parseInt(d,10))while(d--)j=b.createElement("div"),j.id=e?e[d]:h+(d+1),l.appendChild(j);return f=["&#173;",'<style id="s',h,'">',a,
 "</style>"].join(""),l.id=h,(m?l:n).innerHTML+=f,n.appendChild(l),m||(n.style.background="",n.style.overflow="hidden",k=g.style.overflow,g.style.overflow="hidden",g.appendChild(n)),i=c(l,a),m?l.parentNode.removeChild(l):(n.parentNode.removeChild(n),g.style.overflow=k),!!i},z=function(b){var c=a.matchMedia||a.msMatchMedia;if(c)return c(b).matches;var d;return y("@media "+b+" { #"+h+" { position: absolute; } }",function(b){d=(a.getComputedStyle?getComputedStyle(b,null):b.currentStyle)["position"]=="absolute"}),d},A=function(){function d(d,e){e=e||b.createElement(a[d]||"div"),d="on"+d;var f=d in e;return f||(e.setAttribute||(e=b.createElement("div")),e.setAttribute&&e.removeAttribute&&(e.setAttribute(d,""),f=F(e[d],"function"),F(e[d],"undefined")||(e[d]=c),e.removeAttribute(d))),e=null,f}var a={select:"input",change:"input",submit:"form",reset:"form",error:"img",load:"img",abort:"img"};return d}(),B={}.hasOwnProperty,C;!F(B,"undefined")&&!F(B.call,"undefined")?C=function(a,b){return B.
 call(a,b)}:C=function(a,b){return b in a&&F(a.constructor.prototype[b],"undefined")},Function.prototype.bind||(Function.prototype.bind=function(b){var c=this;if(typeof c!="function")throw new TypeError;var d=w.call(arguments,1),e=function(){if(this instanceof e){var a=function(){};a.prototype=c.prototype;var f=new a,g=c.apply(f,d.concat(w.call(arguments)));return Object(g)===g?g:f}return c.apply(b,d.concat(w.call(arguments)))};return e}),s.flexbox=function(){return J("flexWrap")},s.canvas=function(){var a=b.createElement("canvas");return!!a.getContext&&!!a.getContext("2d")},s.canvastext=function(){return!!e.canvas&&!!F(b.createElement("canvas").getContext("2d").fillText,"function")},s.webgl=function(){return!!a.WebGLRenderingContext},s.touch=function(){var c;return"ontouchstart"in a||a.DocumentTouch&&b instanceof DocumentTouch?c=!0:y(["@media (",n.join("touch-enabled),("),h,")","{#modernizr{top:9px;position:absolute}}"].join(""),function(a){c=a.offsetTop===9}),c},s.geolocation=funct
 ion(){return"geolocation"in navigator},s.postmessage=function(){return!!a.postMessage},s.websqldatabase=function(){return!!a.openDatabase},s.indexedDB=function(){return!!J("indexedDB",a)},s.hashchange=function(){return A("hashchange",a)&&(b.documentMode===c||b.documentMode>7)},s.history=function(){return!!a.history&&!!history.pushState},s.draganddrop=function(){var a=b.createElement("div");return"draggable"in a||"ondragstart"in a&&"ondrop"in a},s.websockets=function(){return"WebSocket"in a||"MozWebSocket"in a},s.rgba=function(){return D("background-color:rgba(150,255,150,.5)"),G(j.backgroundColor,"rgba")},s.hsla=function(){return D("background-color:hsla(120,40%,100%,.5)"),G(j.backgroundColor,"rgba")||G(j.backgroundColor,"hsla")},s.multiplebgs=function(){return D("background:url(https://),url(https://),red url(https://)"),/(url\s*\(.*?){3}/.test(j.background)},s.backgroundsize=function(){return J("backgroundSize")},s.borderimage=function(){return J("borderImage")},s.borderradius=fun
 ction(){return J("borderRadius")},s.boxshadow=function(){return J("boxShadow")},s.textshadow=function(){return b.createElement("div").style.textShadow===""},s.opacity=function(){return E("opacity:.55"),/^0.55$/.test(j.opacity)},s.cssanimations=function(){return J("animationName")},s.csscolumns=function(){return J("columnCount")},s.cssgradients=function(){var a="background-image:",b="gradient(linear,left top,right bottom,from(#9f9),to(white));",c="linear-gradient(left top,#9f9, white);";return D((a+"-webkit- ".split(" ").join(b+a)+n.join(c+a)).slice(0,-a.length)),G(j.backgroundImage,"gradient")},s.cssreflections=function(){return J("boxReflect")},s.csstransforms=function(){return!!J("transform")},s.csstransforms3d=function(){var a=!!J("perspective");return a&&"webkitPerspective"in g.style&&y("@media (transform-3d),(-webkit-transform-3d){#modernizr{left:9px;position:absolute;height:3px;}}",function(b,c){a=b.offsetLeft===9&&b.offsetHeight===3}),a},s.csstransitions=function(){return J("
 transition")},s.fontface=function(){var a;return y('@font-face {font-family:"font";src:url("https://")}',function(c,d){var e=b.getElementById("smodernizr"),f=e.sheet||e.styleSheet,g=f?f.cssRules&&f.cssRules[0]?f.cssRules[0].cssText:f.cssText||"":"";a=/src/i.test(g)&&g.indexOf(d.split(" ")[0])===0}),a},s.generatedcontent=function(){var a;return y(["#",h,"{font:0/0 a}#",h,':after{content:"',l,'";visibility:hidden;font:3px/1 a}'].join(""),function(b){a=b.offsetHeight>=3}),a},s.video=function(){var a=b.createElement("video"),c=!1;try{if(c=!!a.canPlayType)c=new Boolean(c),c.ogg=a.canPlayType('video/ogg; codecs="theora"').replace(/^no$/,""),c.h264=a.canPlayType('video/mp4; codecs="avc1.42E01E"').replace(/^no$/,""),c.webm=a.canPlayType('video/webm; codecs="vp8, vorbis"').replace(/^no$/,"")}catch(d){}return c},s.audio=function(){var a=b.createElement("audio"),c=!1;try{if(c=!!a.canPlayType)c=new Boolean(c),c.ogg=a.canPlayType('audio/ogg; codecs="vorbis"').replace(/^no$/,""),c.mp3=a.canPlayTy
 pe("audio/mpeg;").replace(/^no$/,""),c.wav=a.canPlayType('audio/wav; codecs="1"').replace(/^no$/,""),c.m4a=(a.canPlayType("audio/x-m4a;")||a.canPlayType("audio/aac;")).replace(/^no$/,"")}catch(d){}return c},s.localstorage=function(){try{return localStorage.setItem(h,h),localStorage.removeItem(h),!0}catch(a){return!1}},s.sessionstorage=function(){try{return sessionStorage.setItem(h,h),sessionStorage.removeItem(h),!0}catch(a){return!1}},s.webworkers=function(){return!!a.Worker},s.applicationcache=function(){return!!a.applicationCache},s.svg=function(){return!!b.createElementNS&&!!b.createElementNS(r.svg,"svg").createSVGRect},s.inlinesvg=function(){var a=b.createElement("div");return a.innerHTML="<svg/>",(a.firstChild&&a.firstChild.namespaceURI)==r.svg},s.smil=function(){return!!b.createElementNS&&/SVGAnimate/.test(m.call(b.createElementNS(r.svg,"animate")))},s.svgclippaths=function(){return!!b.createElementNS&&/SVGClipPath/.test(m.call(b.createElementNS(r.svg,"clipPath")))};for(var L 
 in s)C(s,L)&&(x=L.toLowerCase(),e[x]=s[L](),v.push((e[x]?"":"no-")+x));return e.input||K(),e.addTest=function(a,b){if(typeof a=="object")for(var d in a)C(a,d)&&e.addTest(d,a[d]);else{a=a.toLowerCase();if(e[a]!==c)return e;b=typeof b=="function"?b():b,typeof f!="undefined"&&f&&(g.className+=" "+(b?"":"no-")+a),e[a]=b}return e},D(""),i=k=null,function(a,b){function k(a,b){var c=a.createElement("p"),d=a.getElementsByTagName("head")[0]||a.documentElement;return c.innerHTML="x<style>"+b+"</style>",d.insertBefore(c.lastChild,d.firstChild)}function l(){var a=r.elements;return typeof a=="string"?a.split(" "):a}function m(a){var b=i[a[g]];return b||(b={},h++,a[g]=h,i[h]=b),b}function n(a,c,f){c||(c=b);if(j)return c.createElement(a);f||(f=m(c));var g;return f.cache[a]?g=f.cache[a].cloneNode():e.test(a)?g=(f.cache[a]=f.createElem(a)).cloneNode():g=f.createElem(a),g.canHaveChildren&&!d.test(a)?f.frag.appendChild(g):g}function o(a,c){a||(a=b);if(j)return a.createDocumentFragment();c=c||m(a);var 
 d=c.frag.cloneNode(),e=0,f=l(),g=f.length;for(;e<g;e++)d.createElement(f[e]);return d}function p(a,b){b.cache||(b.cache={},b.createElem=a.createElement,b.createFrag=a.createDocumentFragment,b.frag=b.createFrag()),a.createElement=function(c){return r.shivMethods?n(c,a,b):b.createElem(c)},a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+l().join().replace(/\w+/g,function(a){return b.createElem(a),b.frag.createElement(a),'c("'+a+'")'})+");return n}")(r,b.frag)}function q(a){a||(a=b);var c=m(a);return r.shivCSS&&!f&&!c.hasCSS&&(c.hasCSS=!!k(a,"article,aside,figcaption,figure,footer,header,hgroup,nav,section{display:block}mark{background:#FF0;color:#000}")),j||p(a,c),a}var c=a.html5||{},d=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,e=/^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i,f,g="_html5shiv",h=0,i={},j;(function(){try{var a=b.create
 Element("a");a.innerHTML="<xyz></xyz>",f="hidden"in a,j=a.childNodes.length==1||function(){b.createElement("a");var a=b.createDocumentFragment();return typeof a.cloneNode=="undefined"||typeof a.createDocumentFragment=="undefined"||typeof a.createElement=="undefined"}()}catch(c){f=!0,j=!0}})();var r={elements:c.elements||"abbr article aside audio bdi canvas data datalist details figcaption figure footer header hgroup mark meter nav output progress section summary time video",shivCSS:c.shivCSS!==!1,supportsUnknownElements:j,shivMethods:c.shivMethods!==!1,type:"default",shivDocument:q,createElement:n,createDocumentFragment:o};a.html5=r,q(b)}(this,b),e._version=d,e._prefixes=n,e._domPrefixes=q,e._cssomPrefixes=p,e.mq=z,e.hasEvent=A,e.testProp=function(a){return H([a])},e.testAllProps=J,e.testStyles=y,e.prefixed=function(a,b,c){return b?J(a,b,c):J(a,"pfx")},g.className=g.className.replace(/(^|\s)no-js(\s|$)/,"$1$2")+(f?" js "+v.join(" "):""),e}(this,this.document),function(a,b,c){functio
 n d(a){return"[object Function]"==o.call(a)}function e(a){return"string"==typeof a}function f(){}function g(a){return!a||"loaded"==a||"complete"==a||"uninitialized"==a}function h(){var a=p.shift();q=1,a?a.t?m(function(){("c"==a.t?B.injectCss:B.injectJs)(a.s,0,a.a,a.x,a.e,1)},0):(a(),h()):q=0}function i(a,c,d,e,f,i,j){function k(b){if(!o&&g(l.readyState)&&(u.r=o=1,!q&&h(),l.onload=l.onreadystatechange=null,b)){"img"!=a&&m(function(){t.removeChild(l)},50);for(var d in y[c])y[c].hasOwnProperty(d)&&y[c][d].onload()}}var j=j||B.errorTimeout,l=b.createElement(a),o=0,r=0,u={t:d,s:c,e:f,a:i,x:j};1===y[c]&&(r=1,y[c]=[]),"object"==a?l.data=c:(l.src=c,l.type=a),l.width=l.height="0",l.onerror=l.onload=l.onreadystatechange=function(){k.call(this,r)},p.splice(e,0,u),"img"!=a&&(r||2===y[c]?(t.insertBefore(l,s?null:n),m(k,j)):y[c].push(l))}function j(a,b,c,d,f){return q=0,b=b||"j",e(a)?i("c"==b?v:u,a,b,this.i++,c,d,f):(p.splice(this.i++,0,a),1==p.length&&h()),this}function k(){var a=B;return a.load
 er={load:j,i:0},a}var l=b.documentElement,m=a.setTimeout,n=b.getElementsByTagName("script")[0],o={}.toString,p=[],q=0,r="MozAppearance"in l.style,s=r&&!!b.createRange().compareNode,t=s?l:n.parentNode,l=a.opera&&"[object Opera]"==o.call(a.opera),l=!!b.attachEvent&&!l,u=r?"object":l?"script":"img",v=l?"script":u,w=Array.isArray||function(a){return"[object Array]"==o.call(a)},x=[],y={},z={timeout:function(a,b){return b.length&&(a.timeout=b[0]),a}},A,B;B=function(a){function b(a){var a=a.split("!"),b=x.length,c=a.pop(),d=a.length,c={url:c,origUrl:c,prefixes:a},e,f,g;for(f=0;f<d;f++)g=a[f].split("="),(e=z[g.shift()])&&(c=e(c,g));for(f=0;f<b;f++)c=x[f](c);return c}function g(a,e,f,g,h){var i=b(a),j=i.autoCallback;i.url.split(".").pop().split("?").shift(),i.bypass||(e&&(e=d(e)?e:e[a]||e[g]||e[a.split("/").pop().split("?")[0]]),i.instead?i.instead(a,e,f,g,h):(y[i.url]?i.noexec=!0:y[i.url]=1,f.load(i.url,i.forceCSS||!i.forceJS&&"css"==i.url.split(".").pop().split("?").shift()?"c":c,i.noexec,
 i.attrs,i.timeout),(d(e)||d(j))&&f.load(function(){k(),e&&e(i.origUrl,h,g),j&&j(i.origUrl,h,g),y[i.url]=2})))}function h(a,b){function c(a,c){if(a){if(e(a))c||(j=function(){var a=[].slice.call(arguments);k.apply(this,a),l()}),g(a,j,b,0,h);else if(Object(a)===a)for(n in m=function(){var b=0,c;for(c in a)a.hasOwnProperty(c)&&b++;return b}(),a)a.hasOwnProperty(n)&&(!c&&!--m&&(d(j)?j=function(){var a=[].slice.call(arguments);k.apply(this,a),l()}:j[n]=function(a){return function(){var b=[].slice.call(arguments);a&&a.apply(this,b),l()}}(k[n])),g(a[n],j,b,n,h))}else!c&&l()}var h=!!a.test,i=a.load||a.both,j=a.callback||f,k=j,l=a.complete||f,m,n;c(h?a.yep:a.nope,!!i),i&&c(i)}var i,j,l=this.yepnope.loader;if(e(a))g(a,0,l,0);else if(w(a))for(i=0;i<a.length;i++)j=a[i],e(j)?g(j,0,l,0):w(j)?B(j):Object(j)===j&&h(j,l);else Object(a)===a&&h(a,l)},B.addPrefix=function(a,b){z[a]=b},B.addFilter=function(a){x.push(a)},B.errorTimeout=1e4,null==b.readyState&&b.addEventListener&&(b.readyState="loading",b.
 addEventListener("DOMContentLoaded",A=function(){b.removeEventListener("DOMContentLoaded",A,0),b.readyState="complete"},0)),a.yepnope=k(),a.yepnope.executeStack=h,a.yepnope.injectJs=function(a,c,d,e,i,j){var k=b.createElement("script"),l,o,e=e||B.errorTimeout;k.src=a;for(o in d)k.setAttribute(o,d[o]);c=j?h:c||f,k.onreadystatechange=k.onload=function(){!l&&g(k.readyState)&&(l=1,c(),k.onload=k.onreadystatechange=null)},m(function(){l||(l=1,c(1))},e),i?k.onload():n.parentNode.insertBefore(k,n)},a.yepnope.injectCss=function(a,c,d,e,g,i){var e=b.createElement("link"),j,c=i?h:c||f;e.href=a,e.rel="stylesheet",e.type="text/css";for(j in d)e.setAttribute(j,d[j]);g||(n.parentNode.insertBefore(e,n),m(c,0))}}(this,document),Modernizr.load=function(){yepnope.apply(window,[].slice.call(arguments,0))};

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_static/js/theme.js
----------------------------------------------------------------------
diff --git a/content/docs/_static/js/theme.js b/content/docs/_static/js/theme.js
new file mode 100644
index 0000000..f9c3949
--- /dev/null
+++ b/content/docs/_static/js/theme.js
@@ -0,0 +1,131 @@
+function toggleCurrent (elem) {
+    var parent_li = elem.closest('li');
+    parent_li.siblings('li.current').removeClass('current');
+    parent_li.siblings().find('li.current').removeClass('current');
+    parent_li.find('> ul li.current').removeClass('current');
+    parent_li.toggleClass('current');
+}
+
+$(document).ready(function() {
+    // Shift nav in mobile when clicking the menu.
+    $(document).on('click', "[data-toggle='wy-nav-top']", function() {
+        $("[data-toggle='wy-nav-shift']").toggleClass("shift");
+        $("[data-toggle='rst-versions']").toggleClass("shift");
+    });
+    // Nav menu link click operations
+    $(document).on('click', ".wy-menu-vertical .current ul li a", function() {
+        var target = $(this);
+        // Close menu when you click a link.
+        $("[data-toggle='wy-nav-shift']").removeClass("shift");
+        $("[data-toggle='rst-versions']").toggleClass("shift");
+        // Handle dynamic display of l3 and l4 nav lists
+        toggleCurrent(target);
+        if (typeof(window.SphinxRtdTheme) != 'undefined') {
+            window.SphinxRtdTheme.StickyNav.hashChange();
+        }
+    });
+    $(document).on('click', "[data-toggle='rst-current-version']", function() {
+        $("[data-toggle='rst-versions']").toggleClass("shift-up");
+    });
+    // Make tables responsive
+    $("table.docutils:not(.field-list)").wrap("<div class='wy-table-responsive'></div>");
+
+    // Add expand links to all parents of nested ul
+    $('.wy-menu-vertical ul').not('.simple').siblings('a').each(function () {
+        var link = $(this);
+            expand = $('<span class="toctree-expand"></span>');
+        expand.on('click', function (ev) {
+            toggleCurrent(link);
+            ev.stopPropagation();
+            return false;
+        });
+        link.prepend(expand);
+    });
+});
+
+// Sphinx theme state
+window.SphinxRtdTheme = (function (jquery) {
+    var stickyNav = (function () {
+        var navBar,
+            win,
+            winScroll = false,
+            winResize = false,
+            linkScroll = false,
+            winPosition = 0,
+            winHeight,
+            docHeight,
+            enable = function () {
+                init();
+                reset();
+                win.on('hashchange', reset);
+
+                // Set scroll monitor
+                win.on('scroll', function () {
+                    if (!linkScroll) {
+                        winScroll = true;
+                    }
+                });
+                setInterval(function () { if (winScroll) scroll(); }, 25);
+
+                // Set resize monitor
+                win.on('resize', function () {
+                    winResize = true;
+                });
+                setInterval(function () { if (winResize) resize(); }, 25);
+                resize();
+            },
+            init = function () {
+                navBar = jquery('nav.wy-nav-side:first');
+                win = jquery(window);
+            },
+            reset = function () {
+                // Get anchor from URL and open up nested nav
+                var anchor = encodeURI(window.location.hash);
+                if (anchor) {
+                    try {
+                        var link = $('.wy-menu-vertical')
+                            .find('[href="' + anchor + '"]');
+                        $('.wy-menu-vertical li.toctree-l1 li.current')
+                            .removeClass('current');
+                        link.closest('li.toctree-l2').addClass('current');
+                        link.closest('li.toctree-l3').addClass('current');
+                        link.closest('li.toctree-l4').addClass('current');
+                    }
+                    catch (err) {
+                        console.log("Error expanding nav for anchor", err);
+                    }
+                }
+            },
+            scroll = function () {
+                winScroll = false;
+                var newWinPosition = win.scrollTop(),
+                    winBottom = newWinPosition + winHeight,
+                    navPosition = navBar.scrollTop(),
+                    newNavPosition = navPosition + (newWinPosition - winPosition);
+                if (newWinPosition < 0 || winBottom > docHeight) {
+                    return;
+                }
+                navBar.scrollTop(newNavPosition);
+                winPosition = newWinPosition;
+            },
+            resize = function () {
+                winResize = false;
+                winHeight = win.height();
+                docHeight = $(document).height();
+            },
+            hashChange = function () {
+                linkScroll = true;
+                win.one('hashchange', function () {
+                    linkScroll = false;
+                });
+            };
+        jquery(init);
+        return {
+            enable: enable,
+            hashChange: hashChange
+        };
+    }());
+    return {
+        StickyNav: stickyNav
+    };
+}($));

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_static/minus.png
----------------------------------------------------------------------
diff --git a/content/docs/_static/minus.png b/content/docs/_static/minus.png
new file mode 100644
index 0000000..0f22b16
Binary files /dev/null and b/content/docs/_static/minus.png differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_static/plus.png
----------------------------------------------------------------------
diff --git a/content/docs/_static/plus.png b/content/docs/_static/plus.png
new file mode 100644
index 0000000..0cfe084
Binary files /dev/null and b/content/docs/_static/plus.png differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_static/pygments.css
----------------------------------------------------------------------
diff --git a/content/docs/_static/pygments.css b/content/docs/_static/pygments.css
new file mode 100644
index 0000000..57eadc0
--- /dev/null
+++ b/content/docs/_static/pygments.css
@@ -0,0 +1,63 @@
+.highlight .hll { background-color: #ffffcc }
+.highlight  { background: #eeffcc; }
+.highlight .c { color: #408090; font-style: italic } /* Comment */
+.highlight .err { border: 1px solid #FF0000 } /* Error */
+.highlight .k { color: #007020; font-weight: bold } /* Keyword */
+.highlight .o { color: #666666 } /* Operator */
+.highlight .cm { color: #408090; font-style: italic } /* Comment.Multiline */
+.highlight .cp { color: #007020 } /* Comment.Preproc */
+.highlight .c1 { color: #408090; font-style: italic } /* Comment.Single */
+.highlight .cs { color: #408090; background-color: #fff0f0 } /* Comment.Special */
+.highlight .gd { color: #A00000 } /* Generic.Deleted */
+.highlight .ge { font-style: italic } /* Generic.Emph */
+.highlight .gr { color: #FF0000 } /* Generic.Error */
+.highlight .gh { color: #000080; font-weight: bold } /* Generic.Heading */
+.highlight .gi { color: #00A000 } /* Generic.Inserted */
+.highlight .go { color: #333333 } /* Generic.Output */
+.highlight .gp { color: #c65d09; font-weight: bold } /* Generic.Prompt */
+.highlight .gs { font-weight: bold } /* Generic.Strong */
+.highlight .gu { color: #800080; font-weight: bold } /* Generic.Subheading */
+.highlight .gt { color: #0044DD } /* Generic.Traceback */
+.highlight .kc { color: #007020; font-weight: bold } /* Keyword.Constant */
+.highlight .kd { color: #007020; font-weight: bold } /* Keyword.Declaration */
+.highlight .kn { color: #007020; font-weight: bold } /* Keyword.Namespace */
+.highlight .kp { color: #007020 } /* Keyword.Pseudo */
+.highlight .kr { color: #007020; font-weight: bold } /* Keyword.Reserved */
+.highlight .kt { color: #902000 } /* Keyword.Type */
+.highlight .m { color: #208050 } /* Literal.Number */
+.highlight .s { color: #4070a0 } /* Literal.String */
+.highlight .na { color: #4070a0 } /* Name.Attribute */
+.highlight .nb { color: #007020 } /* Name.Builtin */
+.highlight .nc { color: #0e84b5; font-weight: bold } /* Name.Class */
+.highlight .no { color: #60add5 } /* Name.Constant */
+.highlight .nd { color: #555555; font-weight: bold } /* Name.Decorator */
+.highlight .ni { color: #d55537; font-weight: bold } /* Name.Entity */
+.highlight .ne { color: #007020 } /* Name.Exception */
+.highlight .nf { color: #06287e } /* Name.Function */
+.highlight .nl { color: #002070; font-weight: bold } /* Name.Label */
+.highlight .nn { color: #0e84b5; font-weight: bold } /* Name.Namespace */
+.highlight .nt { color: #062873; font-weight: bold } /* Name.Tag */
+.highlight .nv { color: #bb60d5 } /* Name.Variable */
+.highlight .ow { color: #007020; font-weight: bold } /* Operator.Word */
+.highlight .w { color: #bbbbbb } /* Text.Whitespace */
+.highlight .mb { color: #208050 } /* Literal.Number.Bin */
+.highlight .mf { color: #208050 } /* Literal.Number.Float */
+.highlight .mh { color: #208050 } /* Literal.Number.Hex */
+.highlight .mi { color: #208050 } /* Literal.Number.Integer */
+.highlight .mo { color: #208050 } /* Literal.Number.Oct */
+.highlight .sb { color: #4070a0 } /* Literal.String.Backtick */
+.highlight .sc { color: #4070a0 } /* Literal.String.Char */
+.highlight .sd { color: #4070a0; font-style: italic } /* Literal.String.Doc */
+.highlight .s2 { color: #4070a0 } /* Literal.String.Double */
+.highlight .se { color: #4070a0; font-weight: bold } /* Literal.String.Escape */
+.highlight .sh { color: #4070a0 } /* Literal.String.Heredoc */
+.highlight .si { color: #70a0d0; font-style: italic } /* Literal.String.Interpol */
+.highlight .sx { color: #c65d09 } /* Literal.String.Other */
+.highlight .sr { color: #235388 } /* Literal.String.Regex */
+.highlight .s1 { color: #4070a0 } /* Literal.String.Single */
+.highlight .ss { color: #517918 } /* Literal.String.Symbol */
+.highlight .bp { color: #007020 } /* Name.Builtin.Pseudo */
+.highlight .vc { color: #bb60d5 } /* Name.Variable.Class */
+.highlight .vg { color: #bb60d5 } /* Name.Variable.Global */
+.highlight .vi { color: #bb60d5 } /* Name.Variable.Instance */
+.highlight .il { color: #208050 } /* Literal.Number.Integer.Long */
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_static/searchtools.js
----------------------------------------------------------------------
diff --git a/content/docs/_static/searchtools.js b/content/docs/_static/searchtools.js
new file mode 100644
index 0000000..0e794fd
--- /dev/null
+++ b/content/docs/_static/searchtools.js
@@ -0,0 +1,622 @@
+/*
+ * searchtools.js_t
+ * ~~~~~~~~~~~~~~~~
+ *
+ * Sphinx JavaScript utilties for the full-text search.
+ *
+ * :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+ * :license: BSD, see LICENSE for details.
+ *
+ */
+
+
+/**
+ * Porter Stemmer
+ */
+var Stemmer = function() {
+
+  var step2list = {
+    ational: 'ate',
+    tional: 'tion',
+    enci: 'ence',
+    anci: 'ance',
+    izer: 'ize',
+    bli: 'ble',
+    alli: 'al',
+    entli: 'ent',
+    eli: 'e',
+    ousli: 'ous',
+    ization: 'ize',
+    ation: 'ate',
+    ator: 'ate',
+    alism: 'al',
+    iveness: 'ive',
+    fulness: 'ful',
+    ousness: 'ous',
+    aliti: 'al',
+    iviti: 'ive',
+    biliti: 'ble',
+    logi: 'log'
+  };
+
+  var step3list = {
+    icate: 'ic',
+    ative: '',
+    alize: 'al',
+    iciti: 'ic',
+    ical: 'ic',
+    ful: '',
+    ness: ''
+  };
+
+  var c = "[^aeiou]";          // consonant
+  var v = "[aeiouy]";          // vowel
+  var C = c + "[^aeiouy]*";    // consonant sequence
+  var V = v + "[aeiou]*";      // vowel sequence
+
+  var mgr0 = "^(" + C + ")?" + V + C;                      // [C]VC... is m>0
+  var meq1 = "^(" + C + ")?" + V + C + "(" + V + ")?$";    // [C]VC[V] is m=1
+  var mgr1 = "^(" + C + ")?" + V + C + V + C;              // [C]VCVC... is m>1
+  var s_v   = "^(" + C + ")?" + v;                         // vowel in stem
+
+  this.stemWord = function (w) {
+    var stem;
+    var suffix;
+    var firstch;
+    var origword = w;
+
+    if (w.length < 3)
+      return w;
+
+    var re;
+    var re2;
+    var re3;
+    var re4;
+
+    firstch = w.substr(0,1);
+    if (firstch == "y")
+      w = firstch.toUpperCase() + w.substr(1);
+
+    // Step 1a
+    re = /^(.+?)(ss|i)es$/;
+    re2 = /^(.+?)([^s])s$/;
+
+    if (re.test(w))
+      w = w.replace(re,"$1$2");
+    else if (re2.test(w))
+      w = w.replace(re2,"$1$2");
+
+    // Step 1b
+    re = /^(.+?)eed$/;
+    re2 = /^(.+?)(ed|ing)$/;
+    if (re.test(w)) {
+      var fp = re.exec(w);
+      re = new RegExp(mgr0);
+      if (re.test(fp[1])) {
+        re = /.$/;
+        w = w.replace(re,"");
+      }
+    }
+    else if (re2.test(w)) {
+      var fp = re2.exec(w);
+      stem = fp[1];
+      re2 = new RegExp(s_v);
+      if (re2.test(stem)) {
+        w = stem;
+        re2 = /(at|bl|iz)$/;
+        re3 = new RegExp("([^aeiouylsz])\\1$");
+        re4 = new RegExp("^" + C + v + "[^aeiouwxy]$");
+        if (re2.test(w))
+          w = w + "e";
+        else if (re3.test(w)) {
+          re = /.$/;
+          w = w.replace(re,"");
+        }
+        else if (re4.test(w))
+          w = w + "e";
+      }
+    }
+
+    // Step 1c
+    re = /^(.+?)y$/;
+    if (re.test(w)) {
+      var fp = re.exec(w);
+      stem = fp[1];
+      re = new RegExp(s_v);
+      if (re.test(stem))
+        w = stem + "i";
+    }
+
+    // Step 2
+    re = /^(.+?)(ational|tional|enci|anci|izer|bli|alli|entli|eli|ousli|ization|ation|ator|alism|iveness|fulness|ousness|aliti|iviti|biliti|logi)$/;
+    if (re.test(w)) {
+      var fp = re.exec(w);
+      stem = fp[1];
+      suffix = fp[2];
+      re = new RegExp(mgr0);
+      if (re.test(stem))
+        w = stem + step2list[suffix];
+    }
+
+    // Step 3
+    re = /^(.+?)(icate|ative|alize|iciti|ical|ful|ness)$/;
+    if (re.test(w)) {
+      var fp = re.exec(w);
+      stem = fp[1];
+      suffix = fp[2];
+      re = new RegExp(mgr0);
+      if (re.test(stem))
+        w = stem + step3list[suffix];
+    }
+
+    // Step 4
+    re = /^(.+?)(al|ance|ence|er|ic|able|ible|ant|ement|ment|ent|ou|ism|ate|iti|ous|ive|ize)$/;
+    re2 = /^(.+?)(s|t)(ion)$/;
+    if (re.test(w)) {
+      var fp = re.exec(w);
+      stem = fp[1];
+      re = new RegExp(mgr1);
+      if (re.test(stem))
+        w = stem;
+    }
+    else if (re2.test(w)) {
+      var fp = re2.exec(w);
+      stem = fp[1] + fp[2];
+      re2 = new RegExp(mgr1);
+      if (re2.test(stem))
+        w = stem;
+    }
+
+    // Step 5
+    re = /^(.+?)e$/;
+    if (re.test(w)) {
+      var fp = re.exec(w);
+      stem = fp[1];
+      re = new RegExp(mgr1);
+      re2 = new RegExp(meq1);
+      re3 = new RegExp("^" + C + v + "[^aeiouwxy]$");
+      if (re.test(stem) || (re2.test(stem) && !(re3.test(stem))))
+        w = stem;
+    }
+    re = /ll$/;
+    re2 = new RegExp(mgr1);
+    if (re.test(w) && re2.test(w)) {
+      re = /.$/;
+      w = w.replace(re,"");
+    }
+
+    // and turn initial Y back to y
+    if (firstch == "y")
+      w = firstch.toLowerCase() + w.substr(1);
+    return w;
+  }
+}
+
+
+
+/**
+ * Simple result scoring code.
+ */
+var Scorer = {
+  // Implement the following function to further tweak the score for each result
+  // The function takes a result array [filename, title, anchor, descr, score]
+  // and returns the new score.
+  /*
+  score: function(result) {
+    return result[4];
+  },
+  */
+
+  // query matches the full name of an object
+  objNameMatch: 11,
+  // or matches in the last dotted part of the object name
+  objPartialMatch: 6,
+  // Additive scores depending on the priority of the object
+  objPrio: {0:  15,   // used to be importantResults
+            1:  5,   // used to be objectResults
+            2: -5},  // used to be unimportantResults
+  //  Used when the priority is not in the mapping.
+  objPrioDefault: 0,
+
+  // query found in title
+  title: 15,
+  // query found in terms
+  term: 5
+};
+
+
+/**
+ * Search Module
+ */
+var Search = {
+
+  _index : null,
+  _queued_query : null,
+  _pulse_status : -1,
+
+  init : function() {
+      var params = $.getQueryParameters();
+      if (params.q) {
+          var query = params.q[0];
+          $('input[name="q"]')[0].value = query;
+          this.performSearch(query);
+      }
+  },
+
+  loadIndex : function(url) {
+    $.ajax({type: "GET", url: url, data: null,
+            dataType: "script", cache: true,
+            complete: function(jqxhr, textstatus) {
+              if (textstatus != "success") {
+                document.getElementById("searchindexloader").src = url;
+              }
+            }});
+  },
+
+  setIndex : function(index) {
+    var q;
+    this._index = index;
+    if ((q = this._queued_query) !== null) {
+      this._queued_query = null;
+      Search.query(q);
+    }
+  },
+
+  hasIndex : function() {
+      return this._index !== null;
+  },
+
+  deferQuery : function(query) {
+      this._queued_query = query;
+  },
+
+  stopPulse : function() {
+      this._pulse_status = 0;
+  },
+
+  startPulse : function() {
+    if (this._pulse_status >= 0)
+        return;
+    function pulse() {
+      var i;
+      Search._pulse_status = (Search._pulse_status + 1) % 4;
+      var dotString = '';
+      for (i = 0; i < Search._pulse_status; i++)
+        dotString += '.';
+      Search.dots.text(dotString);
+      if (Search._pulse_status > -1)
+        window.setTimeout(pulse, 500);
+    }
+    pulse();
+  },
+
+  /**
+   * perform a search for something (or wait until index is loaded)
+   */
+  performSearch : function(query) {
+    // create the required interface elements
+    this.out = $('#search-results');
+    this.title = $('<h2>' + _('Searching') + '</h2>').appendTo(this.out);
+    this.dots = $('<span></span>').appendTo(this.title);
+    this.status = $('<p style="display: none"></p>').appendTo(this.out);
+    this.output = $('<ul class="search"/>').appendTo(this.out);
+
+    $('#search-progress').text(_('Preparing search...'));
+    this.startPulse();
+
+    // index already loaded, the browser was quick!
+    if (this.hasIndex())
+      this.query(query);
+    else
+      this.deferQuery(query);
+  },
+
+  /**
+   * execute search (requires search index to be loaded)
+   */
+  query : function(query) {
+    var i;
+    var stopwords = ["a","and","are","as","at","be","but","by","for","if","in","into","is","it","near","no","not","of","on","or","such","that","the","their","then","there","these","they","this","to","was","will","with"];
+
+    // stem the searchterms and add them to the correct list
+    var stemmer = new Stemmer();
+    var searchterms = [];
+    var excluded = [];
+    var hlterms = [];
+    var tmp = query.split(/\s+/);
+    var objectterms = [];
+    for (i = 0; i < tmp.length; i++) {
+      if (tmp[i] !== "") {
+          objectterms.push(tmp[i].toLowerCase());
+      }
+
+      if ($u.indexOf(stopwords, tmp[i].toLowerCase()) != -1 || tmp[i].match(/^\d+$/) ||
+          tmp[i] === "") {
+        // skip this "word"
+        continue;
+      }
+      // stem the word
+      var word = stemmer.stemWord(tmp[i].toLowerCase());
+      var toAppend;
+      // select the correct list
+      if (word[0] == '-') {
+        toAppend = excluded;
+        word = word.substr(1);
+      }
+      else {
+        toAppend = searchterms;
+        hlterms.push(tmp[i].toLowerCase());
+      }
+      // only add if not already in the list
+      if (!$u.contains(toAppend, word))
+        toAppend.push(word);
+    }
+    var highlightstring = '?highlight=' + $.urlencode(hlterms.join(" "));
+
+    // console.debug('SEARCH: searching for:');
+    // console.info('required: ', searchterms);
+    // console.info('excluded: ', excluded);
+
+    // prepare search
+    var terms = this._index.terms;
+    var titleterms = this._index.titleterms;
+
+    // array of [filename, title, anchor, descr, score]
+    var results = [];
+    $('#search-progress').empty();
+
+    // lookup as object
+    for (i = 0; i < objectterms.length; i++) {
+      var others = [].concat(objectterms.slice(0, i),
+                             objectterms.slice(i+1, objectterms.length));
+      results = results.concat(this.performObjectSearch(objectterms[i], others));
+    }
+
+    // lookup as search terms in fulltext
+    results = results.concat(this.performTermsSearch(searchterms, excluded, terms, Scorer.term))
+                     .concat(this.performTermsSearch(searchterms, excluded, titleterms, Scorer.title));
+
+    // let the scorer override scores with a custom scoring function
+    if (Scorer.score) {
+      for (i = 0; i < results.length; i++)
+        results[i][4] = Scorer.score(results[i]);
+    }
+
+    // now sort the results by score (in opposite order of appearance, since the
+    // display function below uses pop() to retrieve items) and then
+    // alphabetically
+    results.sort(function(a, b) {
+      var left = a[4];
+      var right = b[4];
+      if (left > right) {
+        return 1;
+      } else if (left < right) {
+        return -1;
+      } else {
+        // same score: sort alphabetically
+        left = a[1].toLowerCase();
+        right = b[1].toLowerCase();
+        return (left > right) ? -1 : ((left < right) ? 1 : 0);
+      }
+    });
+
+    // for debugging
+    //Search.lastresults = results.slice();  // a copy
+    //console.info('search results:', Search.lastresults);
+
+    // print the results
+    var resultCount = results.length;
+    function displayNextItem() {
+      // results left, load the summary and display it
+      if (results.length) {
+        var item = results.pop();
+        var listItem = $('<li style="display:none"></li>');
+        if (DOCUMENTATION_OPTIONS.FILE_SUFFIX === '') {
+          // dirhtml builder
+          var dirname = item[0] + '/';
+          if (dirname.match(/\/index\/$/)) {
+            dirname = dirname.substring(0, dirname.length-6);
+          } else if (dirname == 'index/') {
+            dirname = '';
+          }
+          listItem.append($('<a/>').attr('href',
+            DOCUMENTATION_OPTIONS.URL_ROOT + dirname +
+            highlightstring + item[2]).html(item[1]));
+        } else {
+          // normal html builders
+          listItem.append($('<a/>').attr('href',
+            item[0] + DOCUMENTATION_OPTIONS.FILE_SUFFIX +
+            highlightstring + item[2]).html(item[1]));
+        }
+        if (item[3]) {
+          listItem.append($('<span> (' + item[3] + ')</span>'));
+          Search.output.append(listItem);
+          listItem.slideDown(5, function() {
+            displayNextItem();
+          });
+        } else if (DOCUMENTATION_OPTIONS.HAS_SOURCE) {
+          $.ajax({url: DOCUMENTATION_OPTIONS.URL_ROOT + '_sources/' + item[0] + '.txt',
+                  dataType: "text",
+                  complete: function(jqxhr, textstatus) {
+                    var data = jqxhr.responseText;
+                    if (data !== '' && data !== undefined) {
+                      listItem.append(Search.makeSearchSummary(data, searchterms, hlterms));
+                    }
+                    Search.output.append(listItem);
+                    listItem.slideDown(5, function() {
+                      displayNextItem();
+                    });
+                  }});
+        } else {
+          // no source available, just display title
+          Search.output.append(listItem);
+          listItem.slideDown(5, function() {
+            displayNextItem();
+          });
+        }
+      }
+      // search finished, update title and status message
+      else {
+        Search.stopPulse();
+        Search.title.text(_('Search Results'));
+        if (!resultCount)
+          Search.status.text(_('Your search did not match any documents. Please make sure that all words are spelled correctly and that you\'ve selected enough categories.'));
+        else
+            Search.status.text(_('Search finished, found %s page(s) matching the search query.').replace('%s', resultCount));
+        Search.status.fadeIn(500);
+      }
+    }
+    displayNextItem();
+  },
+
+  /**
+   * search for object names
+   */
+  performObjectSearch : function(object, otherterms) {
+    var filenames = this._index.filenames;
+    var objects = this._index.objects;
+    var objnames = this._index.objnames;
+    var titles = this._index.titles;
+
+    var i;
+    var results = [];
+
+    for (var prefix in objects) {
+      for (var name in objects[prefix]) {
+        var fullname = (prefix ? prefix + '.' : '') + name;
+        if (fullname.toLowerCase().indexOf(object) > -1) {
+          var score = 0;
+          var parts = fullname.split('.');
+          // check for different match types: exact matches of full name or
+          // "last name" (i.e. last dotted part)
+          if (fullname == object || parts[parts.length - 1] == object) {
+            score += Scorer.objNameMatch;
+          // matches in last name
+          } else if (parts[parts.length - 1].indexOf(object) > -1) {
+            score += Scorer.objPartialMatch;
+          }
+          var match = objects[prefix][name];
+          var objname = objnames[match[1]][2];
+          var title = titles[match[0]];
+          // If more than one term searched for, we require other words to be
+          // found in the name/title/description
+          if (otherterms.length > 0) {
+            var haystack = (prefix + ' ' + name + ' ' +
+                            objname + ' ' + title).toLowerCase();
+            var allfound = true;
+            for (i = 0; i < otherterms.length; i++) {
+              if (haystack.indexOf(otherterms[i]) == -1) {
+                allfound = false;
+                break;
+              }
+            }
+            if (!allfound) {
+              continue;
+            }
+          }
+          var descr = objname + _(', in ') + title;
+
+          var anchor = match[3];
+          if (anchor === '')
+            anchor = fullname;
+          else if (anchor == '-')
+            anchor = objnames[match[1]][1] + '-' + fullname;
+          // add custom score for some objects according to scorer
+          if (Scorer.objPrio.hasOwnProperty(match[2])) {
+            score += Scorer.objPrio[match[2]];
+          } else {
+            score += Scorer.objPrioDefault;
+          }
+          results.push([filenames[match[0]], fullname, '#'+anchor, descr, score]);
+        }
+      }
+    }
+
+    return results;
+  },
+
+  /**
+   * search for full-text terms in the index
+   */
+  performTermsSearch : function(searchterms, excluded, terms, score) {
+    var filenames = this._index.filenames;
+    var titles = this._index.titles;
+
+    var i, j, file, files;
+    var fileMap = {};
+    var results = [];
+
+    // perform the search on the required terms
+    for (i = 0; i < searchterms.length; i++) {
+      var word = searchterms[i];
+      // no match but word was a required one
+      if ((files = terms[word]) === undefined)
+        break;
+      if (files.length === undefined) {
+        files = [files];
+      }
+      // create the mapping
+      for (j = 0; j < files.length; j++) {
+        file = files[j];
+        if (file in fileMap)
+          fileMap[file].push(word);
+        else
+          fileMap[file] = [word];
+      }
+    }
+
+    // now check if the files don't contain excluded terms
+    for (file in fileMap) {
+      var valid = true;
+
+      // check if all requirements are matched
+      if (fileMap[file].length != searchterms.length)
+          continue;
+
+      // ensure that none of the excluded terms is in the search result
+      for (i = 0; i < excluded.length; i++) {
+        if (terms[excluded[i]] == file ||
+          $u.contains(terms[excluded[i]] || [], file)) {
+          valid = false;
+          break;
+        }
+      }
+
+      // if we have still a valid result we can add it to the result list
+      if (valid) {
+        results.push([filenames[file], titles[file], '', null, score]);
+      }
+    }
+    return results;
+  },
+
+  /**
+   * helper function to return a node containing the
+   * search summary for a given text. keywords is a list
+   * of stemmed words, hlwords is the list of normal, unstemmed
+   * words. the first one is used to find the occurance, the
+   * latter for highlighting it.
+   */
+  makeSearchSummary : function(text, keywords, hlwords) {
+    var textLower = text.toLowerCase();
+    var start = 0;
+    $.each(keywords, function() {
+      var i = textLower.indexOf(this.toLowerCase());
+      if (i > -1)
+        start = i;
+    });
+    start = Math.max(start - 120, 0);
+    var excerpt = ((start > 0) ? '...' : '') +
+      $.trim(text.substr(start, 240)) +
+      ((start + 240 - text.length) ? '...' : '');
+    var rv = $('<div class="context"></div>').text(excerpt);
+    $.each(hlwords, function() {
+      rv = rv.highlightText(this, 'highlighted');
+    });
+    return rv;
+  }
+};
+
+$(document).ready(function() {
+  Search.init();
+});
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_static/underscore-1.3.1.js
----------------------------------------------------------------------
diff --git a/content/docs/_static/underscore-1.3.1.js b/content/docs/_static/underscore-1.3.1.js
new file mode 100644
index 0000000..208d4cd
--- /dev/null
+++ b/content/docs/_static/underscore-1.3.1.js
@@ -0,0 +1,999 @@
+//     Underscore.js 1.3.1
+//     (c) 2009-2012 Jeremy Ashkenas, DocumentCloud Inc.
+//     Underscore is freely distributable under the MIT license.
+//     Portions of Underscore are inspired or borrowed from Prototype,
+//     Oliver Steele's Functional, and John Resig's Micro-Templating.
+//     For all details and documentation:
+//     http://documentcloud.github.com/underscore
+
+(function() {
+
+  // Baseline setup
+  // --------------
+
+  // Establish the root object, `window` in the browser, or `global` on the server.
+  var root = this;
+
+  // Save the previous value of the `_` variable.
+  var previousUnderscore = root._;
+
+  // Establish the object that gets returned to break out of a loop iteration.
+  var breaker = {};
+
+  // Save bytes in the minified (but not gzipped) version:
+  var ArrayProto = Array.prototype, ObjProto = Object.prototype, FuncProto = Function.prototype;
+
+  // Create quick reference variables for speed access to core prototypes.
+  var slice            = ArrayProto.slice,
+      unshift          = ArrayProto.unshift,
+      toString         = ObjProto.toString,
+      hasOwnProperty   = ObjProto.hasOwnProperty;
+
+  // All **ECMAScript 5** native function implementations that we hope to use
+  // are declared here.
+  var
+    nativeForEach      = ArrayProto.forEach,
+    nativeMap          = ArrayProto.map,
+    nativeReduce       = ArrayProto.reduce,
+    nativeReduceRight  = ArrayProto.reduceRight,
+    nativeFilter       = ArrayProto.filter,
+    nativeEvery        = ArrayProto.every,
+    nativeSome         = ArrayProto.some,
+    nativeIndexOf      = ArrayProto.indexOf,
+    nativeLastIndexOf  = ArrayProto.lastIndexOf,
+    nativeIsArray      = Array.isArray,
+    nativeKeys         = Object.keys,
+    nativeBind         = FuncProto.bind;
+
+  // Create a safe reference to the Underscore object for use below.
+  var _ = function(obj) { return new wrapper(obj); };
+
+  // Export the Underscore object for **Node.js**, with
+  // backwards-compatibility for the old `require()` API. If we're in
+  // the browser, add `_` as a global object via a string identifier,
+  // for Closure Compiler "advanced" mode.
+  if (typeof exports !== 'undefined') {
+    if (typeof module !== 'undefined' && module.exports) {
+      exports = module.exports = _;
+    }
+    exports._ = _;
+  } else {
+    root['_'] = _;
+  }
+
+  // Current version.
+  _.VERSION = '1.3.1';
+
+  // Collection Functions
+  // --------------------
+
+  // The cornerstone, an `each` implementation, aka `forEach`.
+  // Handles objects with the built-in `forEach`, arrays, and raw objects.
+  // Delegates to **ECMAScript 5**'s native `forEach` if available.
+  var each = _.each = _.forEach = function(obj, iterator, context) {
+    if (obj == null) return;
+    if (nativeForEach && obj.forEach === nativeForEach) {
+      obj.forEach(iterator, context);
+    } else if (obj.length === +obj.length) {
+      for (var i = 0, l = obj.length; i < l; i++) {
+        if (i in obj && iterator.call(context, obj[i], i, obj) === breaker) return;
+      }
+    } else {
+      for (var key in obj) {
+        if (_.has(obj, key)) {
+          if (iterator.call(context, obj[key], key, obj) === breaker) return;
+        }
+      }
+    }
+  };
+
+  // Return the results of applying the iterator to each element.
+  // Delegates to **ECMAScript 5**'s native `map` if available.
+  _.map = _.collect = function(obj, iterator, context) {
+    var results = [];
+    if (obj == null) return results;
+    if (nativeMap && obj.map === nativeMap) return obj.map(iterator, context);
+    each(obj, function(value, index, list) {
+      results[results.length] = iterator.call(context, value, index, list);
+    });
+    if (obj.length === +obj.length) results.length = obj.length;
+    return results;
+  };
+
+  // **Reduce** builds up a single result from a list of values, aka `inject`,
+  // or `foldl`. Delegates to **ECMAScript 5**'s native `reduce` if available.
+  _.reduce = _.foldl = _.inject = function(obj, iterator, memo, context) {
+    var initial = arguments.length > 2;
+    if (obj == null) obj = [];
+    if (nativeReduce && obj.reduce === nativeReduce) {
+      if (context) iterator = _.bind(iterator, context);
+      return initial ? obj.reduce(iterator, memo) : obj.reduce(iterator);
+    }
+    each(obj, function(value, index, list) {
+      if (!initial) {
+        memo = value;
+        initial = true;
+      } else {
+        memo = iterator.call(context, memo, value, index, list);
+      }
+    });
+    if (!initial) throw new TypeError('Reduce of empty array with no initial value');
+    return memo;
+  };
+
+  // The right-associative version of reduce, also known as `foldr`.
+  // Delegates to **ECMAScript 5**'s native `reduceRight` if available.
+  _.reduceRight = _.foldr = function(obj, iterator, memo, context) {
+    var initial = arguments.length > 2;
+    if (obj == null) obj = [];
+    if (nativeReduceRight && obj.reduceRight === nativeReduceRight) {
+      if (context) iterator = _.bind(iterator, context);
+      return initial ? obj.reduceRight(iterator, memo) : obj.reduceRight(iterator);
+    }
+    var reversed = _.toArray(obj).reverse();
+    if (context && !initial) iterator = _.bind(iterator, context);
+    return initial ? _.reduce(reversed, iterator, memo, context) : _.reduce(reversed, iterator);
+  };
+
+  // Return the first value which passes a truth test. Aliased as `detect`.
+  _.find = _.detect = function(obj, iterator, context) {
+    var result;
+    any(obj, function(value, index, list) {
+      if (iterator.call(context, value, index, list)) {
+        result = value;
+        return true;
+      }
+    });
+    return result;
+  };
+
+  // Return all the elements that pass a truth test.
+  // Delegates to **ECMAScript 5**'s native `filter` if available.
+  // Aliased as `select`.
+  _.filter = _.select = function(obj, iterator, context) {
+    var results = [];
+    if (obj == null) return results;
+    if (nativeFilter && obj.filter === nativeFilter) return obj.filter(iterator, context);
+    each(obj, function(value, index, list) {
+      if (iterator.call(context, value, index, list)) results[results.length] = value;
+    });
+    return results;
+  };
+
+  // Return all the elements for which a truth test fails.
+  _.reject = function(obj, iterator, context) {
+    var results = [];
+    if (obj == null) return results;
+    each(obj, function(value, index, list) {
+      if (!iterator.call(context, value, index, list)) results[results.length] = value;
+    });
+    return results;
+  };
+
+  // Determine whether all of the elements match a truth test.
+  // Delegates to **ECMAScript 5**'s native `every` if available.
+  // Aliased as `all`.
+  _.every = _.all = function(obj, iterator, context) {
+    var result = true;
+    if (obj == null) return result;
+    if (nativeEvery && obj.every === nativeEvery) return obj.every(iterator, context);
+    each(obj, function(value, index, list) {
+      if (!(result = result && iterator.call(context, value, index, list))) return breaker;
+    });
+    return result;
+  };
+
+  // Determine if at least one element in the object matches a truth test.
+  // Delegates to **ECMAScript 5**'s native `some` if available.
+  // Aliased as `any`.
+  var any = _.some = _.any = function(obj, iterator, context) {
+    iterator || (iterator = _.identity);
+    var result = false;
+    if (obj == null) return result;
+    if (nativeSome && obj.some === nativeSome) return obj.some(iterator, context);
+    each(obj, function(value, index, list) {
+      if (result || (result = iterator.call(context, value, index, list))) return breaker;
+    });
+    return !!result;
+  };
+
+  // Determine if a given value is included in the array or object using `===`.
+  // Aliased as `contains`.
+  _.include = _.contains = function(obj, target) {
+    var found = false;
+    if (obj == null) return found;
+    if (nativeIndexOf && obj.indexOf === nativeIndexOf) return obj.indexOf(target) != -1;
+    found = any(obj, function(value) {
+      return value === target;
+    });
+    return found;
+  };
+
+  // Invoke a method (with arguments) on every item in a collection.
+  _.invoke = function(obj, method) {
+    var args = slice.call(arguments, 2);
+    return _.map(obj, function(value) {
+      return (_.isFunction(method) ? method || value : value[method]).apply(value, args);
+    });
+  };
+
+  // Convenience version of a common use case of `map`: fetching a property.
+  _.pluck = function(obj, key) {
+    return _.map(obj, function(value){ return value[key]; });
+  };
+
+  // Return the maximum element or (element-based computation).
+  _.max = function(obj, iterator, context) {
+    if (!iterator && _.isArray(obj)) return Math.max.apply(Math, obj);
+    if (!iterator && _.isEmpty(obj)) return -Infinity;
+    var result = {computed : -Infinity};
+    each(obj, function(value, index, list) {
+      var computed = iterator ? iterator.call(context, value, index, list) : value;
+      computed >= result.computed && (result = {value : value, computed : computed});
+    });
+    return result.value;
+  };
+
+  // Return the minimum element (or element-based computation).
+  _.min = function(obj, iterator, context) {
+    if (!iterator && _.isArray(obj)) return Math.min.apply(Math, obj);
+    if (!iterator && _.isEmpty(obj)) return Infinity;
+    var result = {computed : Infinity};
+    each(obj, function(value, index, list) {
+      var computed = iterator ? iterator.call(context, value, index, list) : value;
+      computed < result.computed && (result = {value : value, computed : computed});
+    });
+    return result.value;
+  };
+
+  // Shuffle an array.
+  _.shuffle = function(obj) {
+    var shuffled = [], rand;
+    each(obj, function(value, index, list) {
+      if (index == 0) {
+        shuffled[0] = value;
+      } else {
+        rand = Math.floor(Math.random() * (index + 1));
+        shuffled[index] = shuffled[rand];
+        shuffled[rand] = value;
+      }
+    });
+    return shuffled;
+  };
+
+  // Sort the object's values by a criterion produced by an iterator.
+  _.sortBy = function(obj, iterator, context) {
+    return _.pluck(_.map(obj, function(value, index, list) {
+      return {
+        value : value,
+        criteria : iterator.call(context, value, index, list)
+      };
+    }).sort(function(left, right) {
+      var a = left.criteria, b = right.criteria;
+      return a < b ? -1 : a > b ? 1 : 0;
+    }), 'value');
+  };
+
+  // Groups the object's values by a criterion. Pass either a string attribute
+  // to group by, or a function that returns the criterion.
+  _.groupBy = function(obj, val) {
+    var result = {};
+    var iterator = _.isFunction(val) ? val : function(obj) { return obj[val]; };
+    each(obj, function(value, index) {
+      var key = iterator(value, index);
+      (result[key] || (result[key] = [])).push(value);
+    });
+    return result;
+  };
+
+  // Use a comparator function to figure out at what index an object should
+  // be inserted so as to maintain order. Uses binary search.
+  _.sortedIndex = function(array, obj, iterator) {
+    iterator || (iterator = _.identity);
+    var low = 0, high = array.length;
+    while (low < high) {
+      var mid = (low + high) >> 1;
+      iterator(array[mid]) < iterator(obj) ? low = mid + 1 : high = mid;
+    }
+    return low;
+  };
+
+  // Safely convert anything iterable into a real, live array.
+  _.toArray = function(iterable) {
+    if (!iterable)                return [];
+    if (iterable.toArray)         return iterable.toArray();
+    if (_.isArray(iterable))      return slice.call(iterable);
+    if (_.isArguments(iterable))  return slice.call(iterable);
+    return _.values(iterable);
+  };
+
+  // Return the number of elements in an object.
+  _.size = function(obj) {
+    return _.toArray(obj).length;
+  };
+
+  // Array Functions
+  // ---------------
+
+  // Get the first element of an array. Passing **n** will return the first N
+  // values in the array. Aliased as `head`. The **guard** check allows it to work
+  // with `_.map`.
+  _.first = _.head = function(array, n, guard) {
+    return (n != null) && !guard ? slice.call(array, 0, n) : array[0];
+  };
+
+  // Returns everything but the last entry of the array. Especcialy useful on
+  // the arguments object. Passing **n** will return all the values in
+  // the array, excluding the last N. The **guard** check allows it to work with
+  // `_.map`.
+  _.initial = function(array, n, guard) {
+    return slice.call(array, 0, array.length - ((n == null) || guard ? 1 : n));
+  };
+
+  // Get the last element of an array. Passing **n** will return the last N
+  // values in the array. The **guard** check allows it to work with `_.map`.
+  _.last = function(array, n, guard) {
+    if ((n != null) && !guard) {
+      return slice.call(array, Math.max(array.length - n, 0));
+    } else {
+      return array[array.length - 1];
+    }
+  };
+
+  // Returns everything but the first entry of the array. Aliased as `tail`.
+  // Especially useful on the arguments object. Passing an **index** will return
+  // the rest of the values in the array from that index onward. The **guard**
+  // check allows it to work with `_.map`.
+  _.rest = _.tail = function(array, index, guard) {
+    return slice.call(array, (index == null) || guard ? 1 : index);
+  };
+
+  // Trim out all falsy values from an array.
+  _.compact = function(array) {
+    return _.filter(array, function(value){ return !!value; });
+  };
+
+  // Return a completely flattened version of an array.
+  _.flatten = function(array, shallow) {
+    return _.reduce(array, function(memo, value) {
+      if (_.isArray(value)) return memo.concat(shallow ? value : _.flatten(value));
+      memo[memo.length] = value;
+      return memo;
+    }, []);
+  };
+
+  // Return a version of the array that does not contain the specified value(s).
+  _.without = function(array) {
+    return _.difference(array, slice.call(arguments, 1));
+  };
+
+  // Produce a duplicate-free version of the array. If the array has already
+  // been sorted, you have the option of using a faster algorithm.
+  // Aliased as `unique`.
+  _.uniq = _.unique = function(array, isSorted, iterator) {
+    var initial = iterator ? _.map(array, iterator) : array;
+    var result = [];
+    _.reduce(initial, function(memo, el, i) {
+      if (0 == i || (isSorted === true ? _.last(memo) != el : !_.include(memo, el))) {
+        memo[memo.length] = el;
+        result[result.length] = array[i];
+      }
+      return memo;
+    }, []);
+    return result;
+  };
+
+  // Produce an array that contains the union: each distinct element from all of
+  // the passed-in arrays.
+  _.union = function() {
+    return _.uniq(_.flatten(arguments, true));
+  };
+
+  // Produce an array that contains every item shared between all the
+  // passed-in arrays. (Aliased as "intersect" for back-compat.)
+  _.intersection = _.intersect = function(array) {
+    var rest = slice.call(arguments, 1);
+    return _.filter(_.uniq(array), function(item) {
+      return _.every(rest, function(other) {
+        return _.indexOf(other, item) >= 0;
+      });
+    });
+  };
+
+  // Take the difference between one array and a number of other arrays.
+  // Only the elements present in just the first array will remain.
+  _.difference = function(array) {
+    var rest = _.flatten(slice.call(arguments, 1));
+    return _.filter(array, function(value){ return !_.include(rest, value); });
+  };
+
+  // Zip together multiple lists into a single array -- elements that share
+  // an index go together.
+  _.zip = function() {
+    var args = slice.call(arguments);
+    var length = _.max(_.pluck(args, 'length'));
+    var results = new Array(length);
+    for (var i = 0; i < length; i++) results[i] = _.pluck(args, "" + i);
+    return results;
+  };
+
+  // If the browser doesn't supply us with indexOf (I'm looking at you, **MSIE**),
+  // we need this function. Return the position of the first occurrence of an
+  // item in an array, or -1 if the item is not included in the array.
+  // Delegates to **ECMAScript 5**'s native `indexOf` if available.
+  // If the array is large and already in sort order, pass `true`
+  // for **isSorted** to use binary search.
+  _.indexOf = function(array, item, isSorted) {
+    if (array == null) return -1;
+    var i, l;
+    if (isSorted) {
+      i = _.sortedIndex(array, item);
+      return array[i] === item ? i : -1;
+    }
+    if (nativeIndexOf && array.indexOf === nativeIndexOf) return array.indexOf(item);
+    for (i = 0, l = array.length; i < l; i++) if (i in array && array[i] === item) return i;
+    return -1;
+  };
+
+  // Delegates to **ECMAScript 5**'s native `lastIndexOf` if available.
+  _.lastIndexOf = function(array, item) {
+    if (array == null) return -1;
+    if (nativeLastIndexOf && array.lastIndexOf === nativeLastIndexOf) return array.lastIndexOf(item);
+    var i = array.length;
+    while (i--) if (i in array && array[i] === item) return i;
+    return -1;
+  };
+
+  // Generate an integer Array containing an arithmetic progression. A port of
+  // the native Python `range()` function. See
+  // [the Python documentation](http://docs.python.org/library/functions.html#range).
+  _.range = function(start, stop, step) {
+    if (arguments.length <= 1) {
+      stop = start || 0;
+      start = 0;
+    }
+    step = arguments[2] || 1;
+
+    var len = Math.max(Math.ceil((stop - start) / step), 0);
+    var idx = 0;
+    var range = new Array(len);
+
+    while(idx < len) {
+      range[idx++] = start;
+      start += step;
+    }
+
+    return range;
+  };
+
+  // Function (ahem) Functions
+  // ------------------
+
+  // Reusable constructor function for prototype setting.
+  var ctor = function(){};
+
+  // Create a function bound to a given object (assigning `this`, and arguments,
+  // optionally). Binding with arguments is also known as `curry`.
+  // Delegates to **ECMAScript 5**'s native `Function.bind` if available.
+  // We check for `func.bind` first, to fail fast when `func` is undefined.
+  _.bind = function bind(func, context) {
+    var bound, args;
+    if (func.bind === nativeBind && nativeBind) return nativeBind.apply(func, slice.call(arguments, 1));
+    if (!_.isFunction(func)) throw new TypeError;
+    args = slice.call(arguments, 2);
+    return bound = function() {
+      if (!(this instanceof bound)) return func.apply(context, args.concat(slice.call(arguments)));
+      ctor.prototype = func.prototype;
+      var self = new ctor;
+      var result = func.apply(self, args.concat(slice.call(arguments)));
+      if (Object(result) === result) return result;
+      return self;
+    };
+  };
+
+  // Bind all of an object's methods to that object. Useful for ensuring that
+  // all callbacks defined on an object belong to it.
+  _.bindAll = function(obj) {
+    var funcs = slice.call(arguments, 1);
+    if (funcs.length == 0) funcs = _.functions(obj);
+    each(funcs, function(f) { obj[f] = _.bind(obj[f], obj); });
+    return obj;
+  };
+
+  // Memoize an expensive function by storing its results.
+  _.memoize = function(func, hasher) {
+    var memo = {};
+    hasher || (hasher = _.identity);
+    return function() {
+      var key = hasher.apply(this, arguments);
+      return _.has(memo, key) ? memo[key] : (memo[key] = func.apply(this, arguments));
+    };
+  };
+
+  // Delays a function for the given number of milliseconds, and then calls
+  // it with the arguments supplied.
+  _.delay = function(func, wait) {
+    var args = slice.call(arguments, 2);
+    return setTimeout(function(){ return func.apply(func, args); }, wait);
+  };
+
+  // Defers a function, scheduling it to run after the current call stack has
+  // cleared.
+  _.defer = function(func) {
+    return _.delay.apply(_, [func, 1].concat(slice.call(arguments, 1)));
+  };
+
+  // Returns a function, that, when invoked, will only be triggered at most once
+  // during a given window of time.
+  _.throttle = function(func, wait) {
+    var context, args, timeout, throttling, more;
+    var whenDone = _.debounce(function(){ more = throttling = false; }, wait);
+    return function() {
+      context = this; args = arguments;
+      var later = function() {
+        timeout = null;
+        if (more) func.apply(context, args);
+        whenDone();
+      };
+      if (!timeout) timeout = setTimeout(later, wait);
+      if (throttling) {
+        more = true;
+      } else {
+        func.apply(context, args);
+      }
+      whenDone();
+      throttling = true;
+    };
+  };
+
+  // Returns a function, that, as long as it continues to be invoked, will not
+  // be triggered. The function will be called after it stops being called for
+  // N milliseconds.
+  _.debounce = function(func, wait) {
+    var timeout;
+    return function() {
+      var context = this, args = arguments;
+      var later = function() {
+        timeout = null;
+        func.apply(context, args);
+      };
+      clearTimeout(timeout);
+      timeout = setTimeout(later, wait);
+    };
+  };
+
+  // Returns a function that will be executed at most one time, no matter how
+  // often you call it. Useful for lazy initialization.
+  _.once = function(func) {
+    var ran = false, memo;
+    return function() {
+      if (ran) return memo;
+      ran = true;
+      return memo = func.apply(this, arguments);
+    };
+  };
+
+  // Returns the first function passed as an argument to the second,
+  // allowing you to adjust arguments, run code before and after, and
+  // conditionally execute the original function.
+  _.wrap = function(func, wrapper) {
+    return function() {
+      var args = [func].concat(slice.call(arguments, 0));
+      return wrapper.apply(this, args);
+    };
+  };
+
+  // Returns a function that is the composition of a list of functions, each
+  // consuming the return value of the function that follows.
+  _.compose = function() {
+    var funcs = arguments;
+    return function() {
+      var args = arguments;
+      for (var i = funcs.length - 1; i >= 0; i--) {
+        args = [funcs[i].apply(this, args)];
+      }
+      return args[0];
+    };
+  };
+
+  // Returns a function that will only be executed after being called N times.
+  _.after = function(times, func) {
+    if (times <= 0) return func();
+    return function() {
+      if (--times < 1) { return func.apply(this, arguments); }
+    };
+  };
+
+  // Object Functions
+  // ----------------
+
+  // Retrieve the names of an object's properties.
+  // Delegates to **ECMAScript 5**'s native `Object.keys`
+  _.keys = nativeKeys || function(obj) {
+    if (obj !== Object(obj)) throw new TypeError('Invalid object');
+    var keys = [];
+    for (var key in obj) if (_.has(obj, key)) keys[keys.length] = key;
+    return keys;
+  };
+
+  // Retrieve the values of an object's properties.
+  _.values = function(obj) {
+    return _.map(obj, _.identity);
+  };
+
+  // Return a sorted list of the function names available on the object.
+  // Aliased as `methods`
+  _.functions = _.methods = function(obj) {
+    var names = [];
+    for (var key in obj) {
+      if (_.isFunction(obj[key])) names.push(key);
+    }
+    return names.sort();
+  };
+
+  // Extend a given object with all the properties in passed-in object(s).
+  _.extend = function(obj) {
+    each(slice.call(arguments, 1), function(source) {
+      for (var prop in source) {
+        obj[prop] = source[prop];
+      }
+    });
+    return obj;
+  };
+
+  // Fill in a given object with default properties.
+  _.defaults = function(obj) {
+    each(slice.call(arguments, 1), function(source) {
+      for (var prop in source) {
+        if (obj[prop] == null) obj[prop] = source[prop];
+      }
+    });
+    return obj;
+  };
+
+  // Create a (shallow-cloned) duplicate of an object.
+  _.clone = function(obj) {
+    if (!_.isObject(obj)) return obj;
+    return _.isArray(obj) ? obj.slice() : _.extend({}, obj);
+  };
+
+  // Invokes interceptor with the obj, and then returns obj.
+  // The primary purpose of this method is to "tap into" a method chain, in
+  // order to perform operations on intermediate results within the chain.
+  _.tap = function(obj, interceptor) {
+    interceptor(obj);
+    return obj;
+  };
+
+  // Internal recursive comparison function.
+  function eq(a, b, stack) {
+    // Identical objects are equal. `0 === -0`, but they aren't identical.
+    // See the Harmony `egal` proposal: http://wiki.ecmascript.org/doku.php?id=harmony:egal.
+    if (a === b) return a !== 0 || 1 / a == 1 / b;
+    // A strict comparison is necessary because `null == undefined`.
+    if (a == null || b == null) return a === b;
+    // Unwrap any wrapped objects.
+    if (a._chain) a = a._wrapped;
+    if (b._chain) b = b._wrapped;
+    // Invoke a custom `isEqual` method if one is provided.
+    if (a.isEqual && _.isFunction(a.isEqual)) return a.isEqual(b);
+    if (b.isEqual && _.isFunction(b.isEqual)) return b.isEqual(a);
+    // Compare `[[Class]]` names.
+    var className = toString.call(a);
+    if (className != toString.call(b)) return false;
+    switch (className) {
+      // Strings, numbers, dates, and booleans are compared by value.
+      case '[object String]':
+        // Primitives and their corresponding object wrappers are equivalent; thus, `"5"` is
+        // equivalent to `new String("5")`.
+        return a == String(b);
+      case '[object Number]':
+        // `NaN`s are equivalent, but non-reflexive. An `egal` comparison is performed for
+        // other numeric values.
+        return a != +a ? b != +b : (a == 0 ? 1 / a == 1 / b : a == +b);
+      case '[object Date]':
+      case '[object Boolean]':
+        // Coerce dates and booleans to numeric primitive values. Dates are compared by their
+        // millisecond representations. Note that invalid dates with millisecond representations
+        // of `NaN` are not equivalent.
+        return +a == +b;
+      // RegExps are compared by their source patterns and flags.
+      case '[object RegExp]':
+        return a.source == b.source &&
+               a.global == b.global &&
+               a.multiline == b.multiline &&
+               a.ignoreCase == b.ignoreCase;
+    }
+    if (typeof a != 'object' || typeof b != 'object') return false;
+    // Assume equality for cyclic structures. The algorithm for detecting cyclic
+    // structures is adapted from ES 5.1 section 15.12.3, abstract operation `JO`.
+    var length = stack.length;
+    while (length--) {
+      // Linear search. Performance is inversely proportional to the number of
+      // unique nested structures.
+      if (stack[length] == a) return true;
+    }
+    // Add the first object to the stack of traversed objects.
+    stack.push(a);
+    var size = 0, result = true;
+    // Recursively compare objects and arrays.
+    if (className == '[object Array]') {
+      // Compare array lengths to determine if a deep comparison is necessary.
+      size = a.length;
+      result = size == b.length;
+      if (result) {
+        // Deep compare the contents, ignoring non-numeric properties.
+        while (size--) {
+          // Ensure commutative equality for sparse arrays.
+          if (!(result = size in a == size in b && eq(a[size], b[size], stack))) break;
+        }
+      }
+    } else {
+      // Objects with different constructors are not equivalent.
+      if ('constructor' in a != 'constructor' in b || a.constructor != b.constructor) return false;
+      // Deep compare objects.
+      for (var key in a) {
+        if (_.has(a, key)) {
+          // Count the expected number of properties.
+          size++;
+          // Deep compare each member.
+          if (!(result = _.has(b, key) && eq(a[key], b[key], stack))) break;
+        }
+      }
+      // Ensure that both objects contain the same number of properties.
+      if (result) {
+        for (key in b) {
+          if (_.has(b, key) && !(size--)) break;
+        }
+        result = !size;
+      }
+    }
+    // Remove the first object from the stack of traversed objects.
+    stack.pop();
+    return result;
+  }
+
+  // Perform a deep comparison to check if two objects are equal.
+  _.isEqual = function(a, b) {
+    return eq(a, b, []);
+  };
+
+  // Is a given array, string, or object empty?
+  // An "empty" object has no enumerable own-properties.
+  _.isEmpty = function(obj) {
+    if (_.isArray(obj) || _.isString(obj)) return obj.length === 0;
+    for (var key in obj) if (_.has(obj, key)) return false;
+    return true;
+  };
+
+  // Is a given value a DOM element?
+  _.isElement = function(obj) {
+    return !!(obj && obj.nodeType == 1);
+  };
+
+  // Is a given value an array?
+  // Delegates to ECMA5's native Array.isArray
+  _.isArray = nativeIsArray || function(obj) {
+    return toString.call(obj) == '[object Array]';
+  };
+
+  // Is a given variable an object?
+  _.isObject = function(obj) {
+    return obj === Object(obj);
+  };
+
+  // Is a given variable an arguments object?
+  _.isArguments = function(obj) {
+    return toString.call(obj) == '[object Arguments]';
+  };
+  if (!_.isArguments(arguments)) {
+    _.isArguments = function(obj) {
+      return !!(obj && _.has(obj, 'callee'));
+    };
+  }
+
+  // Is a given value a function?
+  _.isFunction = function(obj) {
+    return toString.call(obj) == '[object Function]';
+  };
+
+  // Is a given value a string?
+  _.isString = function(obj) {
+    return toString.call(obj) == '[object String]';
+  };
+
+  // Is a given value a number?
+  _.isNumber = function(obj) {
+    return toString.call(obj) == '[object Number]';
+  };
+
+  // Is the given value `NaN`?
+  _.isNaN = function(obj) {
+    // `NaN` is the only value for which `===` is not reflexive.
+    return obj !== obj;
+  };
+
+  // Is a given value a boolean?
+  _.isBoolean = function(obj) {
+    return obj === true || obj === false || toString.call(obj) == '[object Boolean]';
+  };
+
+  // Is a given value a date?
+  _.isDate = function(obj) {
+    return toString.call(obj) == '[object Date]';
+  };
+
+  // Is the given value a regular expression?
+  _.isRegExp = function(obj) {
+    return toString.call(obj) == '[object RegExp]';
+  };
+
+  // Is a given value equal to null?
+  _.isNull = function(obj) {
+    return obj === null;
+  };
+
+  // Is a given variable undefined?
+  _.isUndefined = function(obj) {
+    return obj === void 0;
+  };
+
+  // Has own property?
+  _.has = function(obj, key) {
+    return hasOwnProperty.call(obj, key);
+  };
+
+  // Utility Functions
+  // -----------------
+
+  // Run Underscore.js in *noConflict* mode, returning the `_` variable to its
+  // previous owner. Returns a reference to the Underscore object.
+  _.noConflict = function() {
+    root._ = previousUnderscore;
+    return this;
+  };
+
+  // Keep the identity function around for default iterators.
+  _.identity = function(value) {
+    return value;
+  };
+
+  // Run a function **n** times.
+  _.times = function (n, iterator, context) {
+    for (var i = 0; i < n; i++) iterator.call(context, i);
+  };
+
+  // Escape a string for HTML interpolation.
+  _.escape = function(string) {
+    return (''+string).replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;').replace(/'/g, '&#x27;').replace(/\//g,'&#x2F;');
+  };
+
+  // Add your own custom functions to the Underscore object, ensuring that
+  // they're correctly added to the OOP wrapper as well.
+  _.mixin = function(obj) {
+    each(_.functions(obj), function(name){
+      addToWrapper(name, _[name] = obj[name]);
+    });
+  };
+
+  // Generate a unique integer id (unique within the entire client session).
+  // Useful for temporary DOM ids.
+  var idCounter = 0;
+  _.uniqueId = function(prefix) {
+    var id = idCounter++;
+    return prefix ? prefix + id : id;
+  };
+
+  // By default, Underscore uses ERB-style template delimiters, change the
+  // following template settings to use alternative delimiters.
+  _.templateSettings = {
+    evaluate    : /<%([\s\S]+?)%>/g,
+    interpolate : /<%=([\s\S]+?)%>/g,
+    escape      : /<%-([\s\S]+?)%>/g
+  };
+
+  // When customizing `templateSettings`, if you don't want to define an
+  // interpolation, evaluation or escaping regex, we need one that is
+  // guaranteed not to match.
+  var noMatch = /.^/;
+
+  // Within an interpolation, evaluation, or escaping, remove HTML escaping
+  // that had been previously added.
+  var unescape = function(code) {
+    return code.replace(/\\\\/g, '\\').replace(/\\'/g, "'");
+  };
+
+  // JavaScript micro-templating, similar to John Resig's implementation.
+  // Underscore templating handles arbitrary delimiters, preserves whitespace,
+  // and correctly escapes quotes within interpolated code.
+  _.template = function(str, data) {
+    var c  = _.templateSettings;
+    var tmpl = 'var __p=[],print=function(){__p.push.apply(__p,arguments);};' +
+      'with(obj||{}){__p.push(\'' +
+      str.replace(/\\/g, '\\\\')
+         .replace(/'/g, "\\'")
+         .replace(c.escape || noMatch, function(match, code) {
+           return "',_.escape(" + unescape(code) + "),'";
+         })
+         .replace(c.interpolate || noMatch, function(match, code) {
+           return "'," + unescape(code) + ",'";
+         })
+         .replace(c.evaluate || noMatch, function(match, code) {
+           return "');" + unescape(code).replace(/[\r\n\t]/g, ' ') + ";__p.push('";
+         })
+         .replace(/\r/g, '\\r')
+         .replace(/\n/g, '\\n')
+         .replace(/\t/g, '\\t')
+         + "');}return __p.join('');";
+    var func = new Function('obj', '_', tmpl);
+    if (data) return func(data, _);
+    return function(data) {
+      return func.call(this, data, _);
+    };
+  };
+
+  // Add a "chain" function, which will delegate to the wrapper.
+  _.chain = function(obj) {
+    return _(obj).chain();
+  };
+
+  // The OOP Wrapper
+  // ---------------
+
+  // If Underscore is called as a function, it returns a wrapped object that
+  // can be used OO-style. This wrapper holds altered versions of all the
+  // underscore functions. Wrapped objects may be chained.
+  var wrapper = function(obj) { this._wrapped = obj; };
+
+  // Expose `wrapper.prototype` as `_.prototype`
+  _.prototype = wrapper.prototype;
+
+  // Helper function to continue chaining intermediate results.
+  var result = function(obj, chain) {
+    return chain ? _(obj).chain() : obj;
+  };
+
+  // A method to easily add functions to the OOP wrapper.
+  var addToWrapper = function(name, func) {
+    wrapper.prototype[name] = function() {
+      var args = slice.call(arguments);
+      unshift.call(args, this._wrapped);
+      return result(func.apply(_, args), this._chain);
+    };
+  };
+
+  // Add all of the Underscore functions to the wrapper object.
+  _.mixin(_);
+
+  // Add all mutator Array functions to the wrapper.
+  each(['pop', 'push', 'reverse', 'shift', 'sort', 'splice', 'unshift'], function(name) {
+    var method = ArrayProto[name];
+    wrapper.prototype[name] = function() {
+      var wrapped = this._wrapped;
+      method.apply(wrapped, arguments);
+      var length = wrapped.length;
+      if ((name == 'shift' || name == 'splice') && length === 0) delete wrapped[0];
+      return result(wrapped, this._chain);
+    };
+  });
+
+  // Add all accessor Array functions to the wrapper.
+  each(['concat', 'join', 'slice'], function(name) {
+    var method = ArrayProto[name];
+    wrapper.prototype[name] = function() {
+      return result(method.apply(this._wrapped, arguments), this._chain);
+    };
+  });
+
+  // Start chaining a wrapped Underscore object.
+  wrapper.prototype.chain = function() {
+    this._chain = true;
+    return this;
+  };
+
+  // Extracts the result from a wrapped and chained object.
+  wrapper.prototype.value = function() {
+    return this._wrapped;
+  };
+
+}).call(this);

[13/60] [abbrv] incubator-usergrid git commit: cherry picking docs from master

[sn...@apache.org]

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/orgs-and-apps/organization.html
----------------------------------------------------------------------
diff --git a/content/docs/orgs-and-apps/organization.html b/content/docs/orgs-and-apps/organization.html
new file mode 100644
index 0000000..47f0c4f
--- /dev/null
+++ b/content/docs/orgs-and-apps/organization.html
@@ -0,0 +1,1017 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>Organization &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+        <link rel="next" title="Application" href="application.html"/>
+        <link rel="prev" title="Organization &amp; application management" href="managing.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">Organization</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#creating-an-organization">Creating an organization</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#request-uri">Request URI</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#example-request">Example - Request</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#example-response">Example - Response</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#getting-an-organization">Getting an organization</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#id1">Request URI</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id2">Example - Request</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id3">Example - Response</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#activating-an-organization">Activating an organization</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#request-url">Request URL</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id4">Example - Request</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id5">Example - Response</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#reactivating-an-organization">Reactivating an organization</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#id6">Request URI</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id7">Example - Request</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id8">Example - Response</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#generating-organization-client-credentials">Generating organization client credentials</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#id9">Request URI</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id10">Example - Request</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id11">Example - Response</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#retrieving-organization-client-credentials">Retrieving organization client credentials</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#id12">Request URL</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id13">Example - Request</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id14">Example - Response</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#getting-an-organization-s-activity-feed">Getting an organization&#8217;s activity feed</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#id15">Request URI</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id16">Example - Request</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id17">Example - Response</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#getting-the-applications-in-an-organization">Getting the applications in an organization</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#id18">Request URI</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id19">Example - Request</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id20">Example - Response</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#adding-an-admin-user-to-an-organization">Adding an admin user to an organization</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#id21">Request URI</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id22">Example - Request</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id23">Example - Response</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#getting-the-admin-users-in-an-organization">Getting the admin users in an organization</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#id24">Request URI</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id25">Example - Request</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id26">Example - Response</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#removing-an-admin-user-from-an-organization">Removing an admin user from an organization</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#id27">Request URI</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id28">Example - Request</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id29">Example - Response</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>Organization</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/orgs-and-apps/organization.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="organization">
+<h1>Organization<a class="headerlink" href="#organization" title="Permalink to this headline">¶</a></h1>
+<p>An organization represents the highest level of the API Services BaaS
+data hierarchy. It contains applications (and the entities and
+collections they contain) and is associated with one or more
+administrators. An organization can be representative of a company,
+team, or project. It allows multiple applications to be shared within
+the organization with other administrators.</p>
+<div class="section" id="creating-an-organization">
+<h2>Creating an organization<a class="headerlink" href="#creating-an-organization" title="Permalink to this headline">¶</a></h2>
+<p>Use the POST method to create an organization through a form post.</p>
+<div class="section" id="request-uri">
+<h3>Request URI<a class="headerlink" href="#request-uri" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>POST /organizations|orgs {request body}
+</pre></div>
+</div>
+<p>Parameters</p>
+<p>Expected to be sent form data in the body of the request.</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="37%" />
+<col width="63%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>organization (string)</td>
+<td>The name of the organization.</td>
+</tr>
+<tr class="row-odd"><td>username (string)</td>
+<td>The username of the administrator.</td>
+</tr>
+<tr class="row-even"><td>name (string)</td>
+<td>The name of the administrator.</td>
+</tr>
+<tr class="row-odd"><td>email (string)</td>
+<td>The email address of the administrator.</td>
+</tr>
+<tr class="row-even"><td>password (string)</td>
+<td>The password of the administrator.</td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="section" id="example-request">
+<h3>Example - Request<a class="headerlink" href="#example-request" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X -i POST &quot;https://api.usergrid.com/management/orgs&quot; -d &#39;{&quot;password&quot;:&quot;test12345&quot;,&quot;email&quot;:&quot;tester123@hotmail.com&quot;,&quot;name&quot;:&quot;test&quot;,&quot;username&quot;:&quot;test123&quot;,&quot;organization&quot;:&quot;testorg&quot;}&#39;
+</pre></div>
+</div>
+</div>
+<div class="section" id="example-response">
+<h3>Example - Response<a class="headerlink" href="#example-response" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>{
+  &quot;action&quot;: &quot;new organization&quot;,
+  &quot;status&quot;: &quot;ok&quot;,
+  &quot;data&quot;:  {
+    &quot;owner&quot;:  {
+      &quot;applicationId&quot;: &quot;00000000-0000-0000-0000-000000000001&quot;,
+      &quot;username&quot;: &quot;tester123&quot;,
+      &quot;name&quot;: &quot;test&quot;,
+      &quot;email&quot;: &quot;tester123@hotmail.com&quot;,
+      &quot;activated&quot;: false,
+      &quot;disabled&quot;: false,
+      &quot;uuid&quot;: &quot;48c92c73-0d7e-11e2-98b9-12313d288ee0&quot;,
+      &quot;adminUser&quot;: true,
+      &quot;displayEmailAddress&quot;: &quot;tester123 &lt;tester123@hotmail.com&gt;&quot;,
+      &quot;htmldisplayEmailAddress&quot;: &quot;tester123 &lt;&lt;a href=&quot;mailto:tester123@hotmail.com&quot;&gt;tester123@hotmail.com&lt;/a&gt;&gt;&quot;
+    },
+    &quot;organization&quot;:  {
+      &quot;name&quot;: &quot;testorg&quot;,
+      &quot;uuid&quot;: &quot;5de0bb69-0d7f-11e2-87b9-12313d288ff0&quot;
+    }
+  },
+  &quot;timestamp&quot;: 1349284674173,
+  &quot;duration&quot;: 21376
+}
+</pre></div>
+</div>
+</div>
+</div>
+<div class="section" id="getting-an-organization">
+<h2>Getting an organization<a class="headerlink" href="#getting-an-organization" title="Permalink to this headline">¶</a></h2>
+<p>Use the GET method to retrieve an organization given a specified UUID or
+username.</p>
+<div class="section" id="id1">
+<h3>Request URI<a class="headerlink" href="#id1" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">GET</span> <span class="o">/</span><span class="n">organizations</span><span class="o">|</span><span class="n">orgs</span><span class="o">/</span><span class="p">{</span><span class="n">org_name</span><span class="p">}</span><span class="o">|</span><span class="p">{</span><span class="n">uuid</span><span class="p">}</span>
+</pre></div>
+</div>
+<p>Parameters</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="35%" />
+<col width="65%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>org_name|arg uuid</td>
+<td>Organization name or organization UUID.</td>
+</tr>
+</tbody>
+</table>
+<p>Note: You also need to provide a valid access token with the API call.
+See <a class="reference external" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users and application
+clients</a>
+for details.</p>
+</div>
+<div class="section" id="id2">
+<h3>Example - Request<a class="headerlink" href="#id2" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X GET &quot;https://api.usergrid.com/management/orgs/testorg&quot;
+</pre></div>
+</div>
+</div>
+<div class="section" id="id3">
+<h3>Example - Response<a class="headerlink" href="#id3" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>{
+  &quot;timestamp&quot;: 1349286861746,
+  &quot;duration&quot;: 18,
+  &quot;organization&quot;:  {
+    &quot;users&quot;:  {
+      &quot;tester123&quot;:  {
+        &quot;applicationId&quot;: &quot;00000000-0000-0000-0000-000000000001&quot;,
+        &quot;username&quot;: &quot;tester123&quot;,
+        &quot;name&quot;: &quot;test&quot;,
+        &quot;email&quot;: &quot;tester123@hotmail.com&quot;,
+        &quot;activated&quot;: true,
+        &quot;disabled&quot;: false,
+        &quot;uuid&quot;: &quot;327b527f-cd0c-11e1-bcf7-12313d1c4491&quot;,
+        &quot;adminUser&quot;: true,
+        &quot;displayEmailAddress&quot;: &quot;tester123 &lt;tester123@hotmail.com&gt;&quot;,
+        &quot;htmldisplayEmailAddress&quot;: &quot;tester123 &lt;&lt;a href=&quot;mailto:tester123@hotmail.com&quot;&gt;tester123@hotmail.com&lt;/a&gt;&gt;&quot;
+      }
+    },
+    &quot;name&quot;: &quot;testorg&quot;,
+    &quot;applications&quot;:  {
+      &quot;tester123/sandbox&quot;: &quot;3400ba10-cd0c-11e1-bcf7-12313d1c4491&quot;,
+      &quot;tester123/testapp1&quot;: &quot;be08a5f9-fdd3-11e1-beca-12313d027471&quot;,
+      &quot;tester123/testapp2&quot;: &quot;cede5b7e-fe90-11e1-95c8-12313b122c56&quot;
+    },
+    &quot;uuid&quot;: &quot;33dd0563-cd0c-11e1-bcf7-12313d1c4491&quot;
+}
+</pre></div>
+</div>
+</div>
+</div>
+<div class="section" id="activating-an-organization">
+<h2>Activating an organization<a class="headerlink" href="#activating-an-organization" title="Permalink to this headline">¶</a></h2>
+<p>Use the GET method to activate an organization from a link provided in
+an email notification.</p>
+<div class="section" id="request-url">
+<h3>Request URL<a class="headerlink" href="#request-url" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>GET /organizations|orgs/{org_name}|{uuid}/activate?token={token}&amp;confirm={confirm_email}
+</pre></div>
+</div>
+<p>Parameters</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="27%" />
+<col width="73%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>org_name|arg uuid</td>
+<td>Organization name or organization UUID.</td>
+</tr>
+<tr class="row-odd"><td>token</td>
+<td>Activation token (supplied via email).</td>
+</tr>
+<tr class="row-even"><td>confirm_email</td>
+<td>(boolean) Send confirmation email (false is the default).</td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="section" id="id4">
+<h3>Example - Request<a class="headerlink" href="#id4" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X GET &quot;https://api.usergrid.com/management/orgs/testorg/activate?token=33dd0563-cd0c-11e1-bcf7-12313d1c4491&quot;
+</pre></div>
+</div>
+</div>
+<div class="section" id="id5">
+<h3>Example - Response<a class="headerlink" href="#id5" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+  <span class="s">&quot;action&quot;</span><span class="p">:</span> <span class="s">&quot;activate organization&quot;</span><span class="p">,</span>
+  <span class="s">&quot;timestamp&quot;</span><span class="p">:</span> <span class="mi">1337928462810</span><span class="p">,</span>
+  <span class="s">&quot;duration&quot;</span><span class="p">:</span> <span class="mi">3342</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+</div>
+<div class="section" id="reactivating-an-organization">
+<h2>Reactivating an organization<a class="headerlink" href="#reactivating-an-organization" title="Permalink to this headline">¶</a></h2>
+<p>Use the GET method to reactivate an organization.</p>
+<div class="section" id="id6">
+<h3>Request URI<a class="headerlink" href="#id6" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">GET</span> <span class="o">/</span><span class="n">organizations</span><span class="o">|</span><span class="n">orgs</span><span class="o">/</span><span class="p">{</span><span class="n">org_name</span><span class="p">}</span><span class="o">|</span><span class="p">{</span><span class="n">uuid</span><span class="p">}</span><span class="o">/</span><span class="n">reactivate</span>
+</pre></div>
+</div>
+<p>Parameters</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="41%" />
+<col width="59%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>string org_name|arg uuid</td>
+<td>Organization name or organization UUID.</td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="section" id="id7">
+<h3>Example - Request<a class="headerlink" href="#id7" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X GET &quot;https://api.usergrid.com/management/orgs/testorg/reactivate&quot;
+</pre></div>
+</div>
+</div>
+<div class="section" id="id8">
+<h3>Example - Response<a class="headerlink" href="#id8" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+  <span class="s">&quot;action&quot;</span><span class="p">:</span> <span class="s">&quot;reactivate organization&quot;</span><span class="p">,</span>
+  <span class="s">&quot;timestamp&quot;</span><span class="p">:</span> <span class="mi">1349385280891</span><span class="p">,</span>
+  <span class="s">&quot;duration&quot;</span><span class="p">:</span> <span class="mi">3612</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+</div>
+<div class="section" id="generating-organization-client-credentials">
+<h2>Generating organization client credentials<a class="headerlink" href="#generating-organization-client-credentials" title="Permalink to this headline">¶</a></h2>
+<p>Use the POST method to generate new credentials for an organization
+client.</p>
+<div class="section" id="id9">
+<h3>Request URI<a class="headerlink" href="#id9" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">POST</span> <span class="o">/</span><span class="n">organizations</span><span class="o">|</span><span class="n">orgs</span><span class="o">/</span><span class="p">{</span><span class="n">org_name</span><span class="p">}</span><span class="o">|</span><span class="p">{</span><span class="n">uuid</span><span class="p">}</span><span class="o">/</span><span class="n">credentials</span>
+</pre></div>
+</div>
+<p>Parameters</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="41%" />
+<col width="59%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>string org_name|arg uuid</td>
+<td>Organization name or organization UUID.</td>
+</tr>
+</tbody>
+</table>
+<p><strong>Note</strong>: You also need to provide a valid access token with the API
+call. <a class="reference external" href="../security_and_auth/authenticating-users-and-application-clients.html">Authenticating users and application
+clients</a>
+for details.</p>
+</div>
+<div class="section" id="id10">
+<h3>Example - Request<a class="headerlink" href="#id10" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X POST &quot;https://api.usergrid.com/management/orgs/credentials&quot;
+</pre></div>
+</div>
+</div>
+<div class="section" id="id11">
+<h3>Example - Response<a class="headerlink" href="#id11" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+  <span class="s">&quot;action&quot;</span><span class="p">:</span> <span class="s">&quot;generate organization client credentials&quot;</span><span class="p">,</span>
+  <span class="s">&quot;timestamp&quot;</span><span class="p">:</span> <span class="mi">1349385795647</span><span class="p">,</span>
+  <span class="s">&quot;duration&quot;</span><span class="p">:</span> <span class="mi">7</span><span class="p">,</span>
+  <span class="s">&quot;credentials&quot;</span><span class="p">:</span>  <span class="p">{</span>
+    <span class="s">&quot;client_id&quot;</span><span class="p">:</span> <span class="s">&quot;c2V7N61DY90MCdG78xIxPRxFdQ&quot;</span><span class="p">,</span>
+    <span class="s">&quot;client_secret&quot;</span><span class="p">:</span> <span class="s">&quot;c2V7WEdXIutZWEkWdySLCt_lYDFVMMN&quot;</span>
+  <span class="p">}</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+</div>
+<div class="section" id="retrieving-organization-client-credentials">
+<h2>Retrieving organization client credentials<a class="headerlink" href="#retrieving-organization-client-credentials" title="Permalink to this headline">¶</a></h2>
+<p>Use the GET method to retrieve the credentials for an organization
+client.</p>
+<div class="section" id="id12">
+<h3>Request URL<a class="headerlink" href="#id12" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">GET</span> <span class="o">/</span><span class="n">organizations</span><span class="o">|</span><span class="n">orgs</span><span class="o">/</span><span class="p">{</span><span class="n">org_name</span><span class="p">}</span><span class="o">|</span><span class="p">{</span><span class="n">uuid</span><span class="p">}</span><span class="o">/</span><span class="n">credentials</span>
+</pre></div>
+</div>
+<p>Parameters</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="41%" />
+<col width="59%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>string org_name|arg uuid</td>
+<td>Organization name or organization UUID.</td>
+</tr>
+</tbody>
+</table>
+<p><strong>Note</strong>: You also need to provide a valid access token with the API
+call. See <a class="reference external" href="../security_and_auth/authenticating-users-and-application-clients.html">Authenticating users and application
+clients</a>
+for details.</p>
+</div>
+<div class="section" id="id13">
+<h3>Example - Request<a class="headerlink" href="#id13" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X GET &quot;https://api.usergrid.com/management/orgs/testorg/credentials&quot;
+</pre></div>
+</div>
+</div>
+<div class="section" id="id14">
+<h3>Example - Response<a class="headerlink" href="#id14" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+  <span class="s">&quot;action&quot;</span><span class="p">:</span> <span class="s">&quot;get organization client credentials&quot;</span><span class="p">,</span>
+  <span class="s">&quot;timestamp&quot;</span><span class="p">:</span> <span class="mi">1349386672984</span><span class="p">,</span>
+  <span class="s">&quot;duration&quot;</span><span class="p">:</span> <span class="mi">690</span><span class="p">,</span>
+  <span class="s">&quot;credentials&quot;</span><span class="p">:</span>  <span class="p">{</span>
+    <span class="s">&quot;client_id&quot;</span><span class="p">:</span> <span class="s">&quot;c2V7N61DY90MCdG78xIxPRxFdQ&quot;</span><span class="p">,</span>
+    <span class="s">&quot;client_secret&quot;</span><span class="p">:</span> <span class="s">&quot;c2V7WEdXIutZWEkWdySLCt_lYDFVMMN&quot;</span>
+  <span class="p">}</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+</div>
+<div class="section" id="getting-an-organization-s-activity-feed">
+<h2>Getting an organization&#8217;s activity feed<a class="headerlink" href="#getting-an-organization-s-activity-feed" title="Permalink to this headline">¶</a></h2>
+<p>Use the GET method to get an organization&#8217;s activity feed.</p>
+<div class="section" id="id15">
+<h3>Request URI<a class="headerlink" href="#id15" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">GET</span> <span class="o">/</span><span class="n">organizations</span><span class="o">|</span><span class="n">orgs</span><span class="o">/</span><span class="p">{</span><span class="n">org_name</span><span class="p">}</span><span class="o">|</span><span class="p">{</span><span class="n">uuid</span><span class="p">}</span><span class="o">/</span><span class="n">feed</span>
+</pre></div>
+</div>
+<p>Parameters</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="41%" />
+<col width="59%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>string org_name|arg uuid</td>
+<td>Organization name or organization UUID.</td>
+</tr>
+</tbody>
+</table>
+<p><strong>Note</strong>: You also need to provide a valid access token with the API
+call. See <a class="reference external" href="../security_and_auth/authenticating-users-and-application-clients.html">Authenticating users and application
+clients</a>
+for details.</p>
+</div>
+<div class="section" id="id16">
+<h3>Example - Request<a class="headerlink" href="#id16" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X GET &quot;https://api.usergrid.com/management/orgs/testorg/feed&quot;
+</pre></div>
+</div>
+</div>
+<div class="section" id="id17">
+<h3>Example - Response<a class="headerlink" href="#id17" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>{
+ {
+  &quot;action&quot;: &quot;get organization feed&quot;,
+  &quot;status&quot;: &quot;ok&quot;,
+  &quot;entities&quot;:  [
+     {
+      &quot;uuid&quot;: &quot;cf4d981c-fe90-11e1-95c8-12313b122c56&quot;,
+      &quot;type&quot;: &quot;activity&quot;,
+      &quot;created&quot;: 1347643370454,
+      &quot;modified&quot;: 1347643370454,
+      &quot;actor&quot;:  {
+        &quot;displayName&quot;: &quot;tester123&quot;,
+        &quot;objectType&quot;: &quot;person&quot;,
+        &quot;uuid&quot;: &quot;327b527f-cd0c-11e1-bcf7-12313d1c4491&quot;,
+        &quot;entityType&quot;: &quot;user&quot;
+      },
+      &quot;category&quot;: &quot;admin&quot;,
+      &quot;metadata&quot;:  {
+        &quot;cursor&quot;: &quot;gGkAAQMAgGkABgE5xc3r1gCAdQAQz02YHP6QEeGVyBIxOxIsVgCAdQAQz3SoH_6QEeGVyBIxOxIsVgA&quot;,
+        &quot;path&quot;: &quot;/groups/33dd0563-cd0c-11e1-bcf7-12313d1c4491/feed/cf4d981c-fe90-11e1-95c8-12313b122c56&quot;
+      },
+&quot;object&quot;:  {
+        &quot;displayName&quot;: &quot;testapp2&quot;,
+        &quot;objectType&quot;: &quot;Application&quot;,
+        &quot;uuid&quot;: &quot;cede5b7e-fe90-11e1-95c8-12313b122c56&quot;,
+        &quot;entityType&quot;: &quot;application_info&quot;
+      },
+      &quot;published&quot;: 1347643370454,
+      &quot;title&quot;: &quot;&lt;a mailto=&quot;mailto:tester123@hotmail.com&quot;&gt;tester123 (tester123@hotmail.com)&lt;/a&gt; created a new application named testapp2&quot;,
+      &quot;verb&quot;: &quot;create&quot;
+    },...
+,
+  &quot;timestamp&quot;: 1349387253811
+}
+</pre></div>
+</div>
+</div>
+</div>
+<div class="section" id="getting-the-applications-in-an-organization">
+<h2>Getting the applications in an organization<a class="headerlink" href="#getting-the-applications-in-an-organization" title="Permalink to this headline">¶</a></h2>
+<p>Use the GET method to retrieve the applications in an organization.</p>
+<div class="section" id="id18">
+<h3>Request URI<a class="headerlink" href="#id18" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">GET</span> <span class="o">/</span><span class="n">organizations</span><span class="o">|</span><span class="n">orgs</span><span class="o">/</span><span class="p">{</span><span class="n">org_name</span><span class="p">}</span><span class="o">|</span><span class="p">{</span><span class="n">uuid</span><span class="p">}</span><span class="o">/</span><span class="n">applications</span><span class="o">|</span><span class="n">apps</span>
+</pre></div>
+</div>
+<p>Parameters</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="41%" />
+<col width="59%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>string org_name|arg uuid</td>
+<td>Organization name or organization UUID.</td>
+</tr>
+</tbody>
+</table>
+<p><strong>Note</strong>: You also need to provide a valid access token with the API
+call. See <a class="reference external" href="../security_and_auth/authenticating-users-and-application-clients.html">Authenticating users and application
+clients</a>
+for details.</p>
+</div>
+<div class="section" id="id19">
+<h3>Example - Request<a class="headerlink" href="#id19" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X GET &quot;https://api.usergrid.com/management/orgs/testorg/apps&quot;
+</pre></div>
+</div>
+</div>
+<div class="section" id="id20">
+<h3>Example - Response<a class="headerlink" href="#id20" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+  <span class="s">&quot;action&quot;</span><span class="p">:</span> <span class="s">&quot;get organization application&quot;</span><span class="p">,</span>
+  <span class="s">&quot;data&quot;</span><span class="p">:</span>  <span class="p">{</span>
+    <span class="s">&quot;testorg/sandbox&quot;</span><span class="p">:</span> <span class="s">&quot;3500ba10-cd0c-11e1-bcf8-12313d1c5591&quot;</span><span class="p">,</span>
+    <span class="s">&quot;testorg/testapp1&quot;</span><span class="p">:</span> <span class="s">&quot;be09a5f9-fdd3-11e1-beca-12313d027361&quot;</span><span class="p">,</span>
+    <span class="s">&quot;testorg/testapp2&quot;</span><span class="p">:</span> <span class="s">&quot;cede5b8e-fe90-11e1-65c8-12313b111c56&quot;</span>
+  <span class="p">},</span>
+  <span class="s">&quot;timestamp&quot;</span><span class="p">:</span> <span class="mi">1349815338635</span><span class="p">,</span>
+  <span class="s">&quot;duration&quot;</span><span class="p">:</span> <span class="mi">22</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+</div>
+<div class="section" id="adding-an-admin-user-to-an-organization">
+<h2>Adding an admin user to an organization<a class="headerlink" href="#adding-an-admin-user-to-an-organization" title="Permalink to this headline">¶</a></h2>
+<p>Use the PUT method to add an existing admin user to an organization.</p>
+<div class="section" id="id21">
+<h3>Request URI<a class="headerlink" href="#id21" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">PUT</span> <span class="o">/</span><span class="n">organizations</span><span class="o">|</span><span class="n">orgs</span><span class="o">/</span><span class="p">{</span><span class="n">org_name</span><span class="p">}</span><span class="o">|</span><span class="p">{</span><span class="n">org_uuid</span><span class="p">}</span><span class="o">/</span><span class="n">users</span><span class="o">/</span><span class="p">{</span><span class="n">username</span><span class="o">|</span><span class="n">email</span><span class="o">|</span><span class="n">uuid</span><span class="p">}</span>
+</pre></div>
+</div>
+<p>Parameters</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="47%" />
+<col width="53%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>string org_name|arg org_uuid</td>
+<td>Organization name or organization UUID.</td>
+</tr>
+<tr class="row-odd"><td>string username|string email|arg uuid</td>
+<td>User name, user email address, or user UUID.</td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="section" id="id22">
+<h3>Example - Request<a class="headerlink" href="#id22" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X PUT &quot;https://api.usergrid.com/management/orgs/testorg/users/test123&quot;
+</pre></div>
+</div>
+</div>
+<div class="section" id="id23">
+<h3>Example - Response<a class="headerlink" href="#id23" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>{
+  &quot;action&quot;: &quot;add user to organization&quot;,
+  &quot;status&quot;: &quot;ok&quot;,
+  &quot;data&quot;:  {
+    &quot;user&quot;:  {
+      &quot;applicationId&quot;: &quot;00000000-0000-0000-0000-000000000001&quot;,
+      &quot;username&quot;: &quot;tester123&quot;,
+      &quot;name&quot;: &quot;test&quot;,
+      &quot;email&quot;: &quot;tester123@hotmail.com&quot;,
+      &quot;activated&quot;: true,
+      &quot;disabled&quot;: false,
+      &quot;uuid&quot;: &quot;335b527f-cd0d-11e1-bef8-12331d1c5591&quot;,
+      &quot;adminUser&quot;: true,
+      &quot;displayEmailAddress&quot;: &quot;tester123 &lt;tester123@hotmail.com&gt;&quot;,
+      &quot;htmldisplayEmailAddress&quot;: &quot;tester123 &lt;&lt;a href=&quot;mailto:tester123@hotmail.com&quot;&gt;tester123@hotmail.com&lt;/a&gt;&gt;&quot;
+    }
+  },
+  &quot;timestamp&quot;: 1349390189106,
+  &quot;duration&quot;: 11808
+}
+</pre></div>
+</div>
+</div>
+</div>
+<div class="section" id="getting-the-admin-users-in-an-organization">
+<h2>Getting the admin users in an organization<a class="headerlink" href="#getting-the-admin-users-in-an-organization" title="Permalink to this headline">¶</a></h2>
+<p>Use the GET method to retrieve details about the admin users in an
+organization.</p>
+<div class="section" id="id24">
+<h3>Request URI<a class="headerlink" href="#id24" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">GET</span> <span class="o">/</span><span class="n">organizations</span><span class="o">|</span><span class="n">orgs</span><span class="o">/</span><span class="p">{</span><span class="n">org_name</span><span class="p">}</span><span class="o">|</span><span class="p">{</span><span class="n">org_uuid</span><span class="p">}</span><span class="o">/</span><span class="n">users</span>
+</pre></div>
+</div>
+<p>Parameters</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="39%" />
+<col width="61%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>org_name|arg org_uuid</td>
+<td>Organization name or organization UUID.</td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="section" id="id25">
+<h3>Example - Request<a class="headerlink" href="#id25" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X GET &quot;https://api.usergrid.com/management/orgs/testorg/users&quot;
+</pre></div>
+</div>
+</div>
+<div class="section" id="id26">
+<h3>Example - Response<a class="headerlink" href="#id26" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>{
+  &quot;action&quot;: &quot;get organization users&quot;,
+  &quot;data&quot;:  {
+    &quot;user&quot;:  {
+      &quot;applicationId&quot;: &quot;00000000-0000-0000-0000-000000000001&quot;,
+      &quot;username&quot;: &quot;tester123&quot;,
+      &quot;name&quot;: &quot;test&quot;,
+      &quot;email&quot;: &quot;tester123@hotmail.com&quot;,
+      &quot;activated&quot;: true,
+      &quot;disabled&quot;: false,
+      &quot;uuid&quot;: &quot;335b527f-cd0d-11e1-bef8-12331d1c5591&quot;,
+      &quot;adminUser&quot;: true,
+      &quot;displayEmailAddress&quot;: &quot;tester123 &lt;tester123@hotmail.com&gt;&quot;,
+      &quot;htmldisplayEmailAddress&quot;: &quot;tester123 &lt;&lt;a href=&quot;mailto:tester123@hotmail.com&quot;&gt;tester123@hotmail.com&lt;/a&gt;&gt;&quot;
+    }
+  },
+  &quot;timestamp&quot;: 13494542201685,
+  &quot;duration&quot;: 10
+}
+</pre></div>
+</div>
+</div>
+</div>
+<div class="section" id="removing-an-admin-user-from-an-organization">
+<h2>Removing an admin user from an organization<a class="headerlink" href="#removing-an-admin-user-from-an-organization" title="Permalink to this headline">¶</a></h2>
+<p>Use the DELETE method to remove an admin user from an organization. All
+organizations must have a minimum of one user with org admin privileges.
+If you attempt to delete the last org admin in an organization, the API
+will return a 400 Bad Request error.</p>
+<div class="section" id="id27">
+<h3>Request URI<a class="headerlink" href="#id27" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">DELETE</span> <span class="o">/</span><span class="n">organizations</span><span class="o">|</span><span class="n">orgs</span><span class="o">/</span><span class="p">{</span><span class="n">org_name</span><span class="p">}</span><span class="o">|</span><span class="p">{</span><span class="n">org_uuid</span><span class="p">}</span><span class="o">/</span><span class="n">users</span><span class="o">/</span><span class="p">{</span><span class="n">username</span><span class="o">|</span><span class="n">email</span><span class="o">|</span><span class="n">uuid</span><span class="p">}</span>
+</pre></div>
+</div>
+<p>Parameters</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="43%" />
+<col width="57%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>org_name|arg org_uuid</td>
+<td>Organization name or organization UUID.</td>
+</tr>
+<tr class="row-odd"><td>username|string email|arg uuid</td>
+<td>User name, user email address, or user UUID.</td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="section" id="id28">
+<h3>Example - Request<a class="headerlink" href="#id28" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X DELETE &quot;https://api.usergrid.com/management/orgs/testorg/users/test123&quot;
+</pre></div>
+</div>
+</div>
+<div class="section" id="id29">
+<h3>Example - Response<a class="headerlink" href="#id29" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>{
+  &quot;action&quot;: &quot;remove user from organization&quot;,
+  &quot;status&quot;: &quot;ok&quot;,
+  &quot;data&quot;:  {
+    &quot;user&quot;:  {
+      &quot;applicationId&quot;: &quot;00000000-0000-0000-0000-000000000001&quot;,
+      &quot;username&quot;: &quot;tester123&quot;,
+      &quot;name&quot;: &quot;test&quot;,
+      &quot;email&quot;: &quot;tester123@hotmail.com&quot;,
+      &quot;activated&quot;: true,
+      &quot;disabled&quot;: false,
+      &quot;uuid&quot;: &quot;335b527f-cd0d-11e1-bef8-12331d1c5591&quot;,
+      &quot;adminUser&quot;: true,
+      &quot;displayEmailAddress&quot;: &quot;tester123 &lt;tester123@hotmail.com&gt;&quot;,
+      &quot;htmldisplayEmailAddress&quot;: &quot;tester123 &lt;&lt;a href=&quot;mailto:tester123@hotmail.com&quot;&gt;tester123@hotmail.com&lt;/a&gt;&gt;&quot;
+    }
+  },
+  &quot;timestamp&quot;: 1349453590005,
+  &quot;duration&quot;: 727
+}
+</pre></div>
+</div>
+</div>
+</div>
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+      
+        <a href="application.html" class="btn btn-neutral float-right" title="Application" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+      
+      
+        <a href="managing.html" class="btn btn-neutral" title="Organization &amp; application management" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+      
+    </div>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/push-notifications/tbd.html
----------------------------------------------------------------------
diff --git a/content/docs/push-notifications/tbd.html b/content/docs/push-notifications/tbd.html
new file mode 100644
index 0000000..a5e2846
--- /dev/null
+++ b/content/docs/push-notifications/tbd.html
@@ -0,0 +1,280 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>COMING IN USERGRID 2 &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>COMING IN USERGRID 2</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/push-notifications/tbd.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="coming-in-usergrid-2">
+<h1>COMING IN USERGRID 2<a class="headerlink" href="#coming-in-usergrid-2" title="Permalink to this headline">¶</a></h1>
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/push-notifications/users-devices.html
----------------------------------------------------------------------
diff --git a/content/docs/push-notifications/users-devices.html b/content/docs/push-notifications/users-devices.html
new file mode 100644
index 0000000..618e5f3
--- /dev/null
+++ b/content/docs/push-notifications/users-devices.html
@@ -0,0 +1,537 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>Users &amp; Devices &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>Users &amp; Devices</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/push-notifications/users-devices.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="users-devices">
+<h1>Users &amp; Devices<a class="headerlink" href="#users-devices" title="Permalink to this headline">¶</a></h1>
+<p>Users and Devices are the primary ways to identify access to the system.
+Devices are great to track anonymous access, while Users allow you to
+model signing up, signing in, etc.</p>
+<div class="section" id="users">
+<h2>Users<a class="headerlink" href="#users" title="Permalink to this headline">¶</a></h2>
+</div>
+<div class="section" id="properties">
+<h2>Properties<a class="headerlink" href="#properties" title="Permalink to this headline">¶</a></h2>
+<table border="1" class="docutils">
+<colgroup>
+<col width="13%" />
+<col width="10%" />
+<col width="77%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Property</th>
+<th class="head">Type</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>uuid</td>
+<td>UUID</td>
+<td>User’s unique entity ID</td>
+</tr>
+<tr class="row-odd"><td>type</td>
+<td>string</td>
+<td>Type of entity, in this case “user”</td>
+</tr>
+<tr class="row-even"><td>created</td>
+<td>long</td>
+<td><a class="reference external" href="http://en.wikipedia.org/wiki/Unix_time">UNIX timestamp</a> of entity creation</td>
+</tr>
+<tr class="row-odd"><td>modified</td>
+<td>long</td>
+<td><a class="reference external" href="http://en.wikipedia.org/wiki/Unix_time">UNIX timestamp</a> of entity modification</td>
+</tr>
+<tr class="row-even"><td>username</td>
+<td>string</td>
+<td>Valid and unique string username (mandatory)</td>
+</tr>
+<tr class="row-odd"><td>password</td>
+<td>string</td>
+<td>User password</td>
+</tr>
+<tr class="row-even"><td>email</td>
+<td>string</td>
+<td>Valid and unique email address</td>
+</tr>
+<tr class="row-odd"><td>name</td>
+<td>string</td>
+<td>User display name</td>
+</tr>
+<tr class="row-even"><td>activated</td>
+<td>boolean</td>
+<td>Whether the user account is activated</td>
+</tr>
+<tr class="row-odd"><td>disabled</td>
+<td>boolean</td>
+<td>Whether the user account is administratively disabled</td>
+</tr>
+<tr class="row-even"><td>firstname</td>
+<td>string</td>
+<td>User first name</td>
+</tr>
+<tr class="row-odd"><td>middlename</td>
+<td>string</td>
+<td>User middle name</td>
+</tr>
+<tr class="row-even"><td>lastname</td>
+<td>string</td>
+<td>User last name</td>
+</tr>
+<tr class="row-odd"><td>picture</td>
+<td>string</td>
+<td>User picture</td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="section" id="sets">
+<h2>Sets<a class="headerlink" href="#sets" title="Permalink to this headline">¶</a></h2>
+<table border="1" class="docutils">
+<colgroup>
+<col width="23%" />
+<col width="15%" />
+<col width="62%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Set</th>
+<th class="head">Type</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>connections</td>
+<td>string</td>
+<td>Set of connection types (e.g., likes)</td>
+</tr>
+<tr class="row-odd"><td>rolenames</td>
+<td>string</td>
+<td>Set of roles assigned to a user</td>
+</tr>
+<tr class="row-even"><td>permissions</td>
+<td>string</td>
+<td>Set of user permissions</td>
+</tr>
+<tr class="row-odd"><td>credentials</td>
+<td>string</td>
+<td>Set of user credentials</td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="section" id="relationshops">
+<h2>Relationshops<a class="headerlink" href="#relationshops" title="Permalink to this headline">¶</a></h2>
+<table border="1" class="docutils">
+<colgroup>
+<col width="17%" />
+<col width="15%" />
+<col width="68%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Collection</th>
+<th class="head">Type</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>groups</td>
+<td>group</td>
+<td>Collection of groups to which a user belongs</td>
+</tr>
+<tr class="row-odd"><td>devices</td>
+<td>device</td>
+<td>Collection of devices in the service</td>
+</tr>
+<tr class="row-even"><td>activities</td>
+<td>activity</td>
+<td>Collection of activities a user has performed</td>
+</tr>
+<tr class="row-odd"><td>feed</td>
+<td>activity</td>
+<td>Inbox of activity notifications a user has received</td>
+</tr>
+<tr class="row-even"><td>roles</td>
+<td>role</td>
+<td>Set of roles assigned to a user</td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="section" id="facebook-sign-in">
+<h2>Facebook Sign-in<a class="headerlink" href="#facebook-sign-in" title="Permalink to this headline">¶</a></h2>
+<p>You can authenticate your Apache Usergrid requests by logging into
+Facebook. To access Apache Usergrid resources, you need to provide an
+access token with each request (unless you use the sandbox app). You can
+get an access token by connecting to an appropriate web service endpoint
+and providing the correct client credentials — this is further described
+in <a class="reference external" href="/authenticating-users-and-application-clients">Authenticating users and application
+clients</a>. However, you
+can also obtain an access token by logging into Facebook.</p>
+<p>To enable authentication to Apache Usergrid through Facebook, do the
+following in your app:</p>
+<ol class="arabic">
+<li><p class="first">Make a login call to the Facebook API (do this using the <a class="reference external" href="https://developers.facebook.com/docs/sdks/">Facebook
+SDK</a> or
+<a class="reference external" href="https://developers.facebook.com/docs/facebook-login/">API</a>). If
+the login succeeds, a Facebook access token is returned.</p>
+</li>
+<li><p class="first">Send the Facebook access token to Apache Usergrid. If the Facebook
+access token is valid and the user does not already exist in App
+Services, Apache Usergrid provisions a new Apache Usergrid user. It
+also returns an Apache Usergrid access token, which you can use for
+subsequent Apache Usergrid API calls. Behind the scenes, Apache
+Usergrid uses the Facebook access token to retrieve the user&#8217;s
+profile information from Facebook.</p>
+<p>If the Facebook access token is invalid, Facebook returns an OAuth
+authentication error, and the login does not succeed.</p>
+</li>
+</ol>
+<p>The request to authenticate to Apache Usergrid using a Facebook access
+token is:</p>
+<div class="highlight-python"><div class="highlight"><pre>GET https://api.usergrid.com/{my_org}/{my_app}/auth/facebook?fb_access_token={fb_access_token}
+</pre></div>
+</div>
+<p>where:</p>
+<ul class="simple">
+<li>{my_org} is the organization UUID or organization name.</li>
+<li>{my_app} is the application UUID or application name.</li>
+<li>{fb_access_token} is the Facebook access token.</li>
+</ul>
+</div>
+<div class="section" id="devices">
+<h2>Devices<a class="headerlink" href="#devices" title="Permalink to this headline">¶</a></h2>
+</div>
+<div class="section" id="id1">
+<h2>Properties<a class="headerlink" href="#id1" title="Permalink to this headline">¶</a></h2>
+<table border="1" class="docutils">
+<colgroup>
+<col width="11%" />
+<col width="9%" />
+<col width="80%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Property</th>
+<th class="head">Type</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>uuid</td>
+<td>UUID</td>
+<td>Entity unique ID</td>
+</tr>
+<tr class="row-odd"><td>type</td>
+<td>string</td>
+<td>Entity type (e.g., device)</td>
+</tr>
+<tr class="row-even"><td>created</td>
+<td>long</td>
+<td><a class="reference external" href="http://en.wikipedia.org/wiki/Unix_time">UNIX timestamp</a> of entity creation</td>
+</tr>
+<tr class="row-odd"><td>modified</td>
+<td>long</td>
+<td><a class="reference external" href="http://en.wikipedia.org/wiki/Unix_time">UNIX timestamp</a> of entity modification</td>
+</tr>
+<tr class="row-even"><td>name</td>
+<td>string</td>
+<td>Device name (mandatory)</td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="section" id="relationships">
+<h2>Relationships<a class="headerlink" href="#relationships" title="Permalink to this headline">¶</a></h2>
+<p>Devices have the following associated collection.</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="20%" />
+<col width="11%" />
+<col width="69%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Collection</th>
+<th class="head">Type</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>users</td>
+<td>user</td>
+<td>Collection of users to which a device belongs</td>
+</tr>
+</tbody>
+</table>
+</div>
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

[50/60] [abbrv] incubator-usergrid git commit: Added sdk-outline.md with possible outline for Client SDK docs.

[sn...@apache.org]

Added sdk-outline.md with possible outline for Client SDK docs.

(cherry picked from commit 02fe92936766f35fa23bd6b97c6f7c743710d253)


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/780e3f2f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/780e3f2f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/780e3f2f

Branch: refs/heads/two-dot-o-dev
Commit: 780e3f2f6312bf8496062d315461dc0d6b90ab54
Parents: 16306f4
Author: Dave Johnson <sn...@apache.org>
Authored: Fri Aug 7 13:50:11 2015 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Wed Aug 12 13:02:47 2015 -0400

----------------------------------------------------------------------
 docs/sdks/ios-new.md            | 982 +++++++++++++++++++++++++++++++++++
 docs/sdks/java.md               |   1 -
 docs/sdks/javascript.md         |   3 -
 docs/sdks/sdk-outline.md        | 111 ++++
 docs/sdks/usage.md              |  16 -
 sdks/android/README.md          |   3 +-
 sdks/html5-javascript/README.md |   2 +
 sdks/ios/README.md              |   3 +-
 sdks/nodejs/readme.md           |   2 +
 sdks/ruby/README.md             |   2 +-
 10 files changed, 1101 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/780e3f2f/docs/sdks/ios-new.md
----------------------------------------------------------------------
diff --git a/docs/sdks/ios-new.md b/docs/sdks/ios-new.md
new file mode 100644
index 0000000..0f5b3fe
--- /dev/null
+++ b/docs/sdks/ios-new.md
@@ -0,0 +1,982 @@
+# Usergrid iOS SDK
+
+## Getting Started
+
+### Installing the SDK 
+### Building from Source
+
+# Usergrid SDK Reference with Examples
+
+The 66 topics listed below are each documented in the Usergrid documentation and 
+for each the docs provide an API reference and example for each of these clients:
+curl, iOS, Android, JavaScript, Ruby and Node.js.
+
+## Working with Collections
+
+### 1. Creating collections 
+
+SDK Method
+
+    (ApigeeClientResponse *)apiRequest: (NSString *)url operation:(NSString *)op data:(NSString *)opData
+  
+Parameters
+
+Parameter Description
+--------- ----------- 
+url	      A fully-formed url in the following format: https://api.usergrid.com/<org>/<app>/<collection>
+op	      The HTTP method - in this case, 'POST'
+opData	  No data is being sent, so the value is nil
+
+Example Request/Response
+
+Request:
+
+    -(NSString*)createCollection {
+
+    NSString *url = @"https://api.usergrid.com/your-org/your-app/items";
+    NSString *op = @"POST";
+    NSString *opData = nil;
+
+        //we recommend you call ApigeeClient from your AppDelegate. 
+        //for more information see the iOS SDK install guide: http://apigee.com/docs/app-services/content/installing-apigee-sdk-ios
+        //create an instance of AppDelegate
+        AppDelegate *appDelegate = (AppDelegate *)[ [UIApplication sharedApplication] delegate];
+        
+        //call createEntity to initiate the API call
+        ApigeeClientResponse *response = [appDelegate.dataClient apiRequest: url operation: op data: opData];
+
+    @try {
+        //success
+    }
+    @catch (NSException * e) {
+        //fail
+    }
+
+    }
+				
+Response:
+
+    {
+      "action" : "post",
+      "application" : "f34f4222-a166-11e2-a7f7-02e81adcf3d0",
+      "params" : { },
+      "path" : "/items",
+      "uri" : "http://api.usergrid.com/your-org/your-app/items",
+      "entities" : [ ],
+      "timestamp" : 1378857079220,
+      "duration" : 31,
+      "organization" : "your-org",
+      "applicationName" : "your-app"
+    }
+    
+### 2. Retrieving collections
+
+SDK Method
+
+    (ApigeeCollection*)getCollection:(NSString*)type
+    
+Parameters
+
+Parameter	Description
+---------   -----------
+type	    The entity type associated with the collection to be retrieved
+
+Example Request/Response
+
+Request:
+
+    -(NSString*)getCollection {
+
+        //specify the entity type that corresponds to the collection to be retrieved
+        NSString *type = @"item";
+        
+        //we recommend you call ApigeeClient from your AppDelegate. 
+        //for more information see the iOS SDK install guide: http://apigee.com/docs/app-services/content/installing-apigee-sdk-ios
+
+        //create an instance of AppDelegate
+        AppDelegate *appDelegate = (AppDelegate *)[ [UIApplication sharedApplication] delegate];
+        
+        //Call getCollection: to initiate the API GET request 
+        ApigeeCollection *collection = [appDelegate.dataClient getCollection:@"book"];	
+    }
+                        
+Response:
+
+    {
+          "action" : "get",
+          "application" : "f34f4222-a166-11e2-a7f7-02e81adcf3d0",
+          "params" : { },
+          "path" : "/items",
+          "uri" : "http://api.usergrid.com/your-org/your-app/items",
+          "entities" : [ {
+                "uuid" : "5bb76bca-1657-11e3-903f-9ff6c621a7a4",
+                "type" : "item",
+                "name" : "milk",
+                "created" : 1378405020796,
+                "modified" : 1378405020796,
+                "metadata" : {
+                      "path" : "/items/5bb76bca-1657-11e3-903f-9ff6c621a7a4"
+                },
+                "name" : "milk",
+                "price" : "3.25"
+          }, {
+            "uuid" : "1a9356ba-1682-11e3-a72a-81581bbaf055",
+            "type" : "item",
+            "name" : "bread",
+            "created" : 1378423379867,
+            "modified" : 1378423379867,
+            "metadata" : {
+                  "path" : "/items/1a9356ba-1682-11e3-a72a-81581bbaf055"
+            },
+            "name" : "bread",
+            "price" : "2.50"
+          } ],
+          "timestamp" : 1378426821261,
+          "duration" : 35,
+          "organization" : "your-org",
+          "applicationName" : "your-app",
+          "count" : 2
+    }
+
+### 3. Updating collections
+
+SDK Method
+(ApigeeClientResponse *)apiRequest: (NSString *)url operation:(NSString *)op data:(NSString *)opData
+Properties
+Parameter	Description
+url	A fully-formed request url in the following format:
+https://api.usergrid.com/<org>/<app>/<collection>/?ql=
+Note that you must include an empty '?ql=' query string at the end of the URL
+
+op	The HTTP method - in this case, 'PUT'
+opData	A JSON-formatted string that contains the entity properties to be updated
+Example Request/Response
+Show Code
+Request:
+-(NSString*)updateCollection {
+
+	NSString *url = @"https://api.usergrid.com/your-org/your-app/items/?ql";
+	NSString *op = @"PUT";
+	NSString *opData = @"{\"availability\":\"in-stock\"}"; //we escape the quotes
+	
+	//we recommend you call ApigeeClient from your AppDelegate. 
+	//for more information see the iOS SDK install guide: http://apigee.com/docs/app-services/content/installing-apigee-sdk-ios
+	//create an instance of AppDelegate
+	AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
+	
+	//call apiRequest to initiate the API call
+	ApigeeClientResponse *response = [appDelegate.dataClient apiRequest: url operation: op data: opData];
+	
+	@try {
+	    //success
+	}
+	@catch (NSException * e) {
+	    //fail
+	}
+
+}
+				
+Response:
+{
+  "action" : "put",
+  "application" : "f34f4222-a166-11e2-a7f7-02e81adcf3d0",
+  "params" : {
+    "ql" : [ "" ]
+  },
+  "path" : "/items",
+  "uri" : "http://api.usergrid.com/your-org/your-app/items",
+  "entities" : [ {
+    "uuid" : "31847b9a-1a62-11e3-be04-8d05e96f700d",
+    "type" : "item",
+    "name" : "milk",
+    "price" : "3.25",
+    "availability" : "in-stock"
+    "created" : 1378849479113,
+    "modified" : 1378849567301,
+    "name" : "milk",
+  }, {
+    "uuid" : "3192ac6a-1a62-11e3-a24f-496ca1d42ce7",
+    "type" : "item",
+    "name" : "bread",
+    "price" : "4.00",
+    "availability" : "in-stock"
+    "created" : 1378849479206,
+    "modified" : 1378849567351,
+    "name" : "bread",
+  } ],
+  "timestamp" : 1378849567280,
+  "duration" : 207,
+  "organization" : "your-org",
+  "applicationName" : "your-app"
+}
+
+### 4. Deleting collections
+
+SDK Method
+(ApigeeClientResponse *)apiRequest: (NSString *)url operation:(NSString *)op data:(NSString *)opData
+Properties
+Parameter	Description
+url	A fully-formed url in the following format:
+https://api.usergrid.com/<org>/<app>/<collection>/?ql=
+Note that you must include an empty '?ql=' query string at the end of the URL
+
+op	The HTTP method - in this case, 'DELETE'
+opData	No data is being sent, so the value is nil
+Example Request/Response
+The following example will delete the first 5 entities in a collection.
+
+Show Code
+Request:
+-(NSString*)deleteCollection {
+
+	NSString *url = @"https://api.usergrid.com/your-org/your-app/items/?ql='limit=5'";
+	NSString *op = @"DELETE";
+	NSString *opData = nil;
+	
+	//we recommend you call ApigeeClient from your AppDelegate. 
+	//for more information see the iOS SDK install guide: http://apigee.com/docs/app-services/content/installing-apigee-sdk-ios
+	//create an instance of AppDelegate
+	AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
+	
+	//call createEntity to initiate the API call
+	ApigeeClientResponse *response = [appDelegate.dataClient apiRequest: url operation: op data: opData];
+	
+	@try {
+	    //success
+	}
+	@catch (NSException * e) {
+	    //fail
+	}
+
+}
+				
+Response:
+{
+  "action" : "delete",
+  "application" : "f34f4222-a166-11e2-a7f7-02e81adcf3d0",
+  "params" : {
+    "ql" : [ "" ]
+  },
+  "path" : "/items",
+  "uri" : "http://api.usergrid.com/your-org/your-app/items",
+  "entities" : [ {
+    "uuid" : "53fe3700-0abe-11e3-b1f7-1bd100b8059e",
+    "type" : "item",
+    "name" : "milk",
+    "price" : "3.25",
+    "created" : 1377129832047,
+    "modified" : 1377129832047,
+    "metadata" : {
+      "path" : "/items/53fe3700-0abe-11e3-b1f7-1bd100b8059e"
+    },
+    "name" : "milk"
+  }, {
+    "uuid" : "5ae1fa7a-0abe-11e3-89ab-6be0003c809b",
+    "type" : "item",
+    "name" : "bread",
+    "price" : "4.00",
+    "created" : 1377129843607,
+    "modified" : 1377129843607,
+    "metadata" : {
+      "path" : "/items/5ae1fa7a-0abe-11e3-89ab-6be0003c809b"
+    },
+    "name" : "bread"
+  } ],
+  "timestamp" : 1378848117272,
+  "duration" : 12275,
+  "organization" : "your-org",
+  "applicationName" : "your-app"
+}
+
+## Working with Entities
+
+### 5. Creating a custom entity
+
+SDK Method
+(ApigeeClientResponse *)createEntity:(NSDictionary *)newEntity
+Parameters
+Parameter	Description
+newEntity	NSDictionary object that contains the entity properties
+Example Request/Response
+Show Code
+Request:
+-(NSString*)newEntity {
+	
+	//create an entity object	
+	NSMutableDictionary *entity = [[NSMutableDictionary alloc] init ];
+	
+	//Set entity properties
+	[entity setObject:@"item" forKey:@"type"]; //Required. New entity type to create
+	[entity setObject:@"milk" forKey:@"name"];
+	[entity setObject:@"3.25" forKey:@"price"];
+	
+	//we recommend you call ApigeeClient from your AppDelegate. 
+	//for more information see the iOS SDK install guide: http://apigee.com/docs/app-services/content/installing-apigee-sdk-ios
+	//create an instance of AppDelegate
+	AppDelegate *appDelegate = (AppDelegate *)[ [UIApplication sharedApplication] delegate];
+	
+	//call createEntity to initiate the API call
+	ApigeeClientResponse *response = [appDelegate.dataClient createEntity:entity];
+	
+	@try {	    
+	    //success	    
+	}
+	@catch (NSException * e) {
+	    //fail
+	}
+    
+}
+				
+Response:
+    { 
+        "action" : "post", 
+        "application" : "4a1edb70-d7a8-11e2-9ce3-f315e5aa568a", 
+        "params" : { }, 
+        "path" : "/items", "uri" : "http://api.usergrid.com/my-org/my-app/items", 
+        "entities" : [ { 
+            "uuid" : "83e9b7ea-e8f5-11e2-84df-e94123890c7a", 
+            "type" : "item", 
+            "name" : "milk", 
+            "created" : 1373415195230, 
+            "modified" : 1373415195230, 
+            "metadata" : { 
+
+                "path" : "/items/83e9b7ea-e8f5-11e2-84df-e94123890c7a" 
+            }, 
+            "name" : "milk", 
+            "price" : "3.25"
+        } ], 
+        "timestamp" : 1373415195225, 
+        "duration" : 635, 
+        "organization" : "my-org", 
+        "applicationName" : "my-app" 
+    }
+    
+    
+### 6. Creating multiple custom entities
+
+Request Syntax
+curl -X POST https://api.usergrid.com/<org>/<app>/<entity_type>/ -d '[{<entity>}, {<entity>}, ...]'
+Parameters
+Parameter	Description
+org	Organization UUID or name
+app	Application UUID or name
+entity_type	Custom entity type to create. API Services will create a corresponding collection if one does not already exist. To add an entity to an existing collections, use the collection name or colleciton UUID in place of the entity type.
+entity	Comma-separated list of entity objects to create. Each object should be formatted as a comma-separated list of entity properties, formatted as key-value pairs in the format <property>:<value>
+Example Request/Response
+Show Code
+Request:
+curl -X POST "https://api.usergrid.com/your-org/your-app/item" -d '[{"name":"milk", "price":"3.25"}, {"name":"bread", "price":"2.50"}]'
+Response:
+{
+    "action" : "post",
+    "application" : "f34f4222-a166-11e2-a7f7-02e9sjwsf3d0",
+    "params" : { },
+    "path" : "/items",
+    "uri" : "http://api.usergrid.com/your-org/your-app/items",
+    "entities" : [ {
+        "uuid" : "f3a8061a-ef0b-11e2-9e92-5f4a65c16193",
+        "type" : "item",
+        "name" : "milk",
+        "price" : "3.25",
+        "created" : 1374084538609,
+        "modified" : 1374084538609,
+        "metadata" : {
+            "path" : "/multis/f3a8061a-ef0b-11e2-9e92-5f4a65c16193"
+        },
+        "name" : "milk"
+    }, {
+        "uuid" : "f3be262a-ef0b-11e2-a51b-6715d5ef47a6",
+        "type" : "item",
+        "name" : "bread",
+        "price" : "2.50",
+        "created" : 1374084538754,
+        "modified" : 1374084538754,
+        "metadata" : {
+            "path" : "/items/f3be262a-ef0b-11e2-a51b-6715d5ef47a6"
+        },
+        "name" : "bread"
+    } ],
+    "timestamp" : 1374084538584,
+    "duration" : 388,
+    "organization" : "your-org",
+    "applicationName" : "your-app"
+}
+
+### 7. Creating an entity with sub-properties
+
+SDK Method
+(ApigeeClientResponse *)createEntity:(NSDictionary *)newEntity
+Parameters
+Parameter	Description
+newEntity	NSMutableDictionary object that contains the entity properties
+Example Request/Response
+Show Code
+Request:
+-(NSString*)newEntity {
+    
+	//Initialize an object for the new entity to be created
+	NSMutableDictionary *entity = [ [NSMutableDictionary alloc] init ];
+	
+	//Initialize an object for each nested variety object
+	NSMutableDictionary *variety_1 = [ [NSMutableDictionary alloc] init ];
+    NSMutableDictionary *variety_2 = [ [NSMutableDictionary alloc] init ];
+    NSMutableDictionary *variety_3 = [ [NSMutableDictionary alloc] init ];
+        
+    //Initialize an array to hold the nested variety objects
+    NSMutableArray *variety_list = [ [NSMutableArray alloc] init];
+	
+    [variety_1 setObject:@"1%" forKey:@"name"];
+    [variety_1 setObject:@"3.25" forKey:@"price"];
+	[variety_1 setObject:@"0393847575533445" forKey:@"sku"];    
+	
+    [variety_2 setObject:@"whole" forKey:@"name"];
+    [variety_2 setObject:@"3.85" forKey:@"price"];
+	[variety_2 setObject:@"0393394956788445" forKey:@"sku"];
+	
+	[variety_3 setObject:@"skim" forKey:@"name"];
+    [variety_3 setObject:@"4.00" forKey:@"price"];
+	[variety_3 setObject:@"0390299933488445" forKey:@"sku"];
+	
+	//Add the variety objects to the array
+    [variety_list addObject:variety_1];
+    [variety_list addObject:variety_2];
+    [variety_list addObject:variety_3];
+    
+    //Set the item entity properties
+	[entity setObject:@"item" forKey:@"type"]; //Required. New entity type to create
+	[entity setObject:@"milk" forKey:@"name"];
+	
+	//Set the variety_list array as the value of the 'varieties' property
+	[entity setObject:variety_list forKey:@"varieties"];
+	
+	//we recommend you call ApigeeClient from your AppDelegate. 
+	//for more information see the iOS SDK install guide: http://apigee.com/docs/app-services/content/installing-apigee-sdk-ios
+	//create an instance of AppDelegate
+	AppDelegate *appDelegate = (AppDelegate *)[ [UIApplication sharedApplication] delegate];
+	
+	//call createEntity to initiate the API call
+	ApigeeClientResponse *response = [appDelegate.dataClient createEntity:entity];
+	
+	@try {
+	    //success
+	}
+	@catch (NSException * e) {
+	    //fail
+	}
+    
+}
+				
+Response:
+{ 
+	"action" : "post", 
+	"application" : "f34f4222-a166-11e2-a7f7-02e81adcf3d0", 
+	"params" : { }, 
+	"path" : "/items", 
+	"uri" : "http://api.usergrid.com/your-org/your-app/items", 
+	"entities" : [ { 
+		"uuid" : "0d7cf92a-effb-11e2-917d-c5e707256e71", 
+		"type" : "item", 
+		"name" : "milk", 
+		"created" : 1374187231666, 
+		"modified" : 1374187231666, 
+		"metadata" : { 
+			"path" : "/items/0d7cf92a-effb-11e2-917d-c5e707256e71" 
+		}, 
+		"name" : "milk", 
+		"varieties" : [ { 
+			"name" : "1%", 
+			"price" : "3.25", 
+			"SKU" : "0393847575533445" 
+		}, { 
+			"name" : "whole", 
+			"price" : "3.85", 
+			"SKU" : "0393394956788445" 
+		}, { 
+			"name" : "skim", 
+			"price" : "4.00", 
+			"SKU" : "0390299933488445" 
+		} ] 
+	} ], 
+	"timestamp" : 1374187450826, 
+	"duration" : 50, 
+	"organization" : "your-org", 
+	"applicationName" : "your-app" 
+}
+
+
+### 8. Retrieving an entity
+
+SDK Method
+
+    (ApigeeClientResponse *)getEntities: (NSString *)endpoint query:(NSString *)query
+    
+Properties
+
+Parameter	Description
+---------   -----------
+endpoint	The collection and entity identifier of the entity to be retrieved.
+query	    An optional query string. Requests for a specific entity should set the value to nil
+ 
+Endpoint exported in the following format: <collection>/<entity_UUID_or_name>
+
+Example Request/Response
+
+Request:
+
+    -(NSString*)getEntity {
+
+        //specify the entity collection and UUID or name to be retrieved	
+        NSString *endpoint = @"items/b3aad0a4-f322-11e2-a9c1-999e12039f87";	
+        
+        NSString *query = nil;
+        
+        //we recommend you call ApigeeClient from your AppDelegate. 
+        //for more information see the iOS SDK install guide: http://apigee.com/docs/app-services/content/installing-apigee-sdk-ios
+        //create an instance of AppDelegate
+        AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
+        
+        //call getEntities to initiate the API call
+        ApigeeClientResponse *response = [appDelegate.dataClient getEntities:endpoint queryString:query];
+        
+        @try {
+            //success
+        }
+        
+        @catch (NSException * e) {
+            //fail
+        }
+
+    }				
+				
+Response:
+
+    {
+        "action" : "get",
+        "application" : "f34f4222-a166-11e2-a7f7-02e81adcf3d0",
+        "params" : { },
+        "path" : "/items",
+        "uri" : "http://api.usergrid.com/amuramoto/sandbox/items",
+        "entities" : [ {
+            "uuid" : "5bb76bca-1657-11e3-903f-9ff6c621a7a4",
+            "type" : "item",
+            "name" : "milk",
+            "created" : 1378405020796,
+            "modified" : 1378405020796,
+            "metadata" : {
+                  "path" : "/items/5bb76bca-1657-11e3-903f-9ff6c621a7a4"
+            },
+            "name" : "milk",
+            "price" : "3.25"
+        } ],
+        "timestamp" : 1378405025763,
+        "duration" : 31,
+        "organization" : "amuramoto",
+        "applicationName" : "sandbox"
+    }
+
+### 9. Retrieving multiple entities
+
+SDK Method
+
+    (ApigeeClientResponse *)getEntities: (NSString *)type queryString:(NSString *)queryString
+    
+Properties
+
+Parameter	Description
+---------   -----------
+type	    The entity type being retrieved
+queryString	A query string of entity properties to be matched for the entities to be retrieved.
+ 
+Query string is expected in the following format: <property>=<value> OR <property>=<value> OR ...
+
+Example Request/Response
+
+Request:
+
+    -(NSString*)getEntity {
+
+    //specify the entity type to be retrieved	
+    NSString *type = @"item";
+
+    //specify the uuid of the entity to be retrieved in a query string
+    NSString *query = @"uuid = b3aad0a4-f322-11e2-a9c1-999e12039f87 or name = 'bread'";
+
+        //we recommend you call ApigeeClient from your AppDelegate. 
+        //for more information see the iOS SDK install guide: http://apigee.com/docs/app-services/content/installing-apigee-sdk-ios
+        //create an instance of AppDelegate
+        AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
+        
+        //call createEntity to initiate the API call
+        ApigeeClientResponse *response = [appDelegate.dataClient getEntities:type queryString:query];
+
+    @try {
+        //success
+    }
+    @catch (NSException * e) {
+        //fail
+    }
+
+    }
+				
+Response:
+
+    {
+          "action" : "get",
+          "application" : "f34f4222-a166-11e2-a7f7-02e81adcf3d0",
+          "params" : {
+                "ql" : [ "name='milk' OR UUID=1a9356ba-1682-11e3-a72a-81581bbaf055" ]
+          },
+          "path" : "/items",
+          "uri" : "http://api.usergrid.com/your-org/your-app/items",
+          "entities" : [ {
+                "uuid" : "5bb76bca-1657-11e3-903f-9ff6c621a7a4",
+                "type" : "item",
+                "name" : "milk",
+                "created" : 1378405020796,
+                "modified" : 1378405020796,
+                "metadata" : {
+                      "path" : "/items/5bb76bca-1657-11e3-903f-9ff6c621a7a4"
+            },
+                "name" : "milk",
+                "price" : "3.25"
+          }, {
+            "uuid" : "1a9356ba-1682-11e3-a72a-81581bbaf055",
+            "type" : "item",
+            "name" : "bread",
+            "created" : 1378423379867,
+            "modified" : 1378423379867,
+            "metadata" : {
+                  "path" : "/items/1a9356ba-1682-11e3-a72a-81581bbaf055"
+            },
+                "name" : "bread",
+                "price" : "2.50"
+          } ],
+          "timestamp" : 1378423793729,
+          "duration" : 63,
+          "organization" : "your-org",
+          "applicationName" : "your-app",
+          "count" : 2
+    }
+
+
+### 10. Updating an entity
+
+SDK Method
+
+    (ApigeeClientResponse *)updateEntity: (NSString *)entityID entity:(NSDictionary *)updatedEntity
+
+Parameters
+
+Parameter	    Description
+---------       ----------- 
+entityID	    UUID of the entity to be updated
+updatedEntity	NSMutableDictionary containing the properties to be updated
+
+Example Request/Response
+
+Request:
+
+    -(NSString*)updateEntity {
+
+        //UUID of the entity to be updated
+        NSString *entityID = @"f42752aa-08fe-11e3-8268-5bd5fa5f701f";
+        
+        //Create an entity object
+        NSMutableDictionary *updatedEntity = [ [NSMutableDictionary alloc] init ];
+        
+        //Set entity properties to be updated
+        [updatedEntity setObject:@"item" forKey:@"type"]; //Required - entity type
+        [updatedEntity setObject:@"in-stock" forKey:@"availability"];
+        [updatedEntity setObject:@"4.00" forKey:@"price"];
+
+        //we recommend you call ApigeeClient from your AppDelegate. 
+        //for more information see the iOS SDK install guide: http://apigee.com/docs/app-services/content/installing-apigee-sdk-ios
+        //create an instance of AppDelegate
+        AppDelegate *appDelegate = (AppDelegate *)[ [UIApplication sharedApplication] delegate];
+        
+        //call updateEntity to initiate the API call
+        ApigeeClientResponse *response = [appDelegate.dataClient updateEntity:entityID entity:updatedEntity];
+
+        @try {
+            
+           //success
+            
+        }
+        @catch (NSException * e) {
+            //fail
+        }
+        
+    }
+				
+Response:
+
+    {
+      "action" : "put",
+      "application" : "f34f4222-a166-11e2-a7f7-02e81adcf3d0",
+      "params" : { },
+      "path" : "/items",
+      "uri" : "http://api.usergrid.com/your-org/your-app/items",
+      "entities" : [ {
+        "uuid" : "5bb76bca-1657-11e3-903f-9ff6c621a7a4",
+        "type" : "item",
+        "name" : "milk",
+        "created" : 1378405020796,
+        "modified" : 1378505705077,
+        "availability" : "in-stock",
+        "metadata" : {
+          "path" : "/items/5bb76bca-1657-11e3-903f-9ff6c621a7a4"
+        },
+        "name" : "milk",
+        "price" : "4.00"
+      } ],
+      "timestamp" : 1378505705050,
+      "duration" : 87,
+      "organization" : "your-org",
+      "applicationName" : "your-app"
+    }
+
+
+### 11. Updating a sub-property
+
+SDK Method
+
+    (ApigeeClientResponse *)updateEntity: (NSString *)entityID entity:(NSDictionary *)updatedEntity
+
+Parameters
+
+Parameter	    Description
+---------       ----------- 
+entityID	    UUID of the entity to be updated
+updatedEntity	Entity object containing the properties to be updated
+
+Example Request/Response
+
+Request:
+
+    -(NSString*)updateEntity {
+
+        //UUID of the entity to be updated
+        NSString *entityID = @"f42752aa-08fe-11e3-8268-5bd5fa5f701f";
+            
+        //Define our two sub-properties to include in the update
+        NSMutableDictionary *subproperty1 = [ [NSMutableDictionary alloc] init];
+        NSMutableDictionary *subproperty2 = [ [NSMutableDictionary alloc] init];
+        [subproperty1 setObject:@"1%" forKey:@"name"];
+        [subproperty1 setObject:@"3.25" forKey:@"price"];
+        [subproperty2 setObject:@"whole" forKey:@"name"];
+        [subproperty2 setObject:@"4.00" forKey:@"price"];
+        
+        //Put our sub-properties into an NSArray
+        NSArray *subproperties = [ [NSArray alloc] initWithObjects:props1,props2, nil];
+
+        //Create an NSMutableDictionary to hold our updates
+        NSMutableDictionary *updatedEntity = [ [NSMutableDictionary alloc] init ];
+
+        //Set the properties to be updated
+        [updatedEntity setObject:@"item" forKey:@"type"]; //Required - entity type
+        [updatedEntity setObject:props forKey:@"varieties"];
+        
+        //we recommend you call ApigeeClient from your AppDelegate. 
+        //for more information see the iOS SDK install guide: http://apigee.com/docs/app-services/content/installing-apigee-sdk-ios
+        //create an instance of AppDelegate
+        AppDelegate *appDelegate = (AppDelegate *)[ [UIApplication sharedApplication] delegate];
+        
+        //call createEntity to initiate the API call
+        ApigeeClientResponse *response = [appDelegate.dataClient updateEntity:entityID entity:updatedEntity];
+
+        @try {
+            
+           //success
+            
+        }
+        @catch (NSException * e) {
+            //fail
+        }
+        
+    }
+				
+Response:
+
+    {
+      "action" : "put",
+      "application" : "f34f4222-a166-11e2-a7f7-02e81adcf3d0",
+      "params" : { },
+      "path" : "/items",
+      "uri" : "http://api.usergrid.com/your-org/your-app/items",
+      "entities" : [ {
+        "uuid" : "5bb76bca-1657-11e3-903f-9ff6c621a7a4",
+        "type" : "item",
+        "name" : "milk",
+        "created" : 1378405020796,
+        "modified" : 1378761459069,
+        "availability" : "in-stock",
+        "metadata" : {
+          "path" : "/items/5bb76bca-1657-11e3-903f-9ff6c621a7a4"
+        },
+        "name" : "milk",
+        "uri" : "http://api.usergrid.com/your-org/your-app/items/5bb76bca-1657-11e3-903f-9ff6c621a7a4",
+        "varieties" : [ {
+          "name" : "1%",
+          "price" : "3.25"
+        }, {
+          "name" : "whole",
+          "price" : "4.00"
+        } ]
+      } ],
+      "timestamp" : 1378761459047,
+      "duration" : 62,
+      "organization" : "your-org",
+      "applicationName" : "your-app"
+    }
+
+
+### 12. Deleting data entities
+
+SDK Method
+
+    (ApigeeClientResponse *)removeEntity: (NSString *)type entityID:(NSString *)entityID
+    
+Properties
+
+Parameter	Description
+---------   -----------
+type	    The entity type being deleted
+entityID	The UUID or name of the entity to be removed
+
+Example Request/Response
+
+Request:
+
+    -(NSString*)deleteEntity {
+
+        //specify the entity type to be deleted	
+        NSString *type = @"item";
+        
+        //specify the uuid or name of the entity to be deleted
+        NSString *entityId = @"milk";
+        
+        //we recommend you call ApigeeClient from your AppDelegate. 
+        //for more information see the iOS SDK install guide: http://apigee.com/docs/app-services/content/installing-apigee-sdk-ios
+        //create an instance of AppDelegate
+        AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
+        
+        //call removeEntity to initiate the API call
+        ApigeeClientResponse *response = [appDelegate.dataClient removeEntity:type entityID:entityId];
+        
+        @try {
+            //success
+        }
+        @catch (NSException * e) {
+            //fail
+        }
+    }
+				
+Response:
+
+    {
+      "action" : "delete",
+      "application" : "f34f4222-a166-11e2-a7f7-02e81adcf3d0",
+      "params" : { },
+      "path" : "/items",
+      "uri" : "http://api.usergrid.com/your-org/your-app/items",
+      "entities" : [ {
+        "uuid" : "328fe64a-19a0-11e3-8a2a-ebc6f49d1fc4",
+        "type" : "item",
+        "name" : "milk",
+        "created" : 1378766158500,
+        "modified" : 1378766158500,
+        "metadata" : {
+          "path" : "/items/328fe64a-19a0-11e3-8a2a-ebc6f49d1fc4"
+        },
+        "name" : "milk",
+        "price" : "3.25"
+      } ],
+      "timestamp" : 1378766172016,
+      "duration" : 324,
+      "organization" : "your-org",
+      "applicationName" : "your-app"
+    }
+
+
+## Data Queries
+
+### 13. Querying your data 
+
+## Entity Connections
+
+### 14. Connecting users other data
+### 15. Retrieving user connection data
+### 16. Disconnecting entities
+
+## Permissions & Roles
+
+### 17. Assigning permissions
+### 18. Removing permissions
+### 19. Assigning permissions
+### 20. Removing permissions
+### 21. Creating roles 
+### 22. Assigning roles
+### 23. Removing roles 
+	
+## Authentication
+	
+### 24. Application user authentication (user login)
+### 25. Application client authentication
+### 26. Admin user authentication
+### 27. Organization client authentication
+### 28. Revoking tokens (user logout)
+
+# Working with Users & Groups
+
+### 29. Creating users
+### 30. Retrieving user data
+### 31. Setting or updating password
+### 32. Creating groups
+### 33. Retrieving group data
+### 34. Retrieving a group's users
+### 35. Adding users groups
+### 36. Deleting user group
+
+## Activities & Feeds
+
+### 37. Posting a user activity
+### 38. Posting an activity to a group
+### 39. Creating an activity for a user's followers in a group	
+### 40. Retrieving a user's activity feed
+### 41. Retrieving a group's activity feed
+
+## Events & Counters
+
+### 42. Creating & incrementing counters
+### 43. Retrieving counters
+### 44. Retrieving counters by time interval
+
+## Managing Orgs & Apps
+
+### 46. Creating an organization
+### 47. Getting an organization
+### 48. Activating an organization
+### 49. Reactivating an organization
+### 50. Generating organization client credentials
+### 51. Retrieving organization client credentials
+### 52. Getting an organization's activity feed
+### 53. Getting the applications in an organization
+### 54. Getting the admin users in an organization
+### 55. Removing an admin user from an organization
+### 56. Creating an organization application	
+### 57. Generating application credentials
+### 58. Getting application credentials
+
+## Managing Admin Users
+
+### 59. Creating an admin user
+### 60. Updating an admin user
+### 61. Getting an admin user
+### 62. Setting an admin user's password
+### 63. Resetting an admin user's password
+### 64. Activating an admin user
+### 65. Reactivating an admin user
+### 66. Getting an admin user's activity feed
+	
+	
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/780e3f2f/docs/sdks/java.md
----------------------------------------------------------------------
diff --git a/docs/sdks/java.md b/docs/sdks/java.md
deleted file mode 100644
index a2a5086..0000000
--- a/docs/sdks/java.md
+++ /dev/null
@@ -1 +0,0 @@
-# Java SDK
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/780e3f2f/docs/sdks/javascript.md
----------------------------------------------------------------------
diff --git a/docs/sdks/javascript.md b/docs/sdks/javascript.md
deleted file mode 100644
index 685d42d..0000000
--- a/docs/sdks/javascript.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# JavaScript/HTML5 SDK
-
-

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/780e3f2f/docs/sdks/sdk-outline.md
----------------------------------------------------------------------
diff --git a/docs/sdks/sdk-outline.md b/docs/sdks/sdk-outline.md
new file mode 100644
index 0000000..48bd3fc
--- /dev/null
+++ b/docs/sdks/sdk-outline.md
@@ -0,0 +1,111 @@
+# Usergrid SDK Documentation outline
+
+## Getting Started
+
+### Installing the SDK 
+### Building from Source
+
+# Usergrid SDK Reference with Examples
+
+The 66 topics listed below are each documented in the Usergrid documentation and 
+for each the docs provide an API reference and example for each of these clients:
+curl, iOS, Android, JavaScript, Ruby and Node.js.
+
+## Working with Collections
+
+### 1. Creating collections 
+### 2. Retrieving collections
+### 3. Updating collections
+### 4. Deleting collections
+
+## Working with Entities
+
+### 5. Creating a custom entity
+### 6. Creating multiple custom entities
+### 7. Creating an entity with sub-properties
+### 8. Retrieving an entity
+### 9. Retrieving multiple entities
+### 10. Updating an entity
+### 11. Updating a sub-property
+### 12. Deleting data entities
+
+## Data Queries
+
+### 13. Querying your data 
+
+## Entity Connections
+
+### 14. Connecting users other data
+### 15. Retrieving user connection data
+### 16. Disconnecting entities
+
+## Permissions & Roles
+
+### 17. Assigning permissions
+### 18. Removing permissions
+### 19. Assigning permissions
+### 20. Removing permissions
+### 21. Creating roles 
+### 22. Assigning roles
+### 23. Removing roles 
+	
+## Authentication
+	
+### 24. Application user authentication (user login)
+### 25. Application client authentication
+### 26. Admin user authentication
+### 27. Organization client authentication
+### 28. Revoking tokens (user logout)
+
+# Working with Users & Groups
+
+### 29. Creating users
+### 30. Retrieving user data
+### 31. Setting or updating password
+### 32. Creating groups
+### 33. Retrieving group data
+### 34. Retrieving a group's users
+### 35. Adding users groups
+### 36. Deleting user group
+
+## Activities & Feeds
+
+### 37. Posting a user activity
+### 38. Posting an activity to a group
+### 39. Creating an activity for a user's followers in a group	
+### 40. Retrieving a user's activity feed
+### 41. Retrieving a group's activity feed
+
+## Events & Counters
+
+### 42. Creating & incrementing counters
+### 43. Retrieving counters
+### 44. Retrieving counters by time interval
+
+## Managing Orgs & Apps
+
+### 46. Creating an organization
+### 47. Getting an organization
+### 48. Activating an organization
+### 49. Reactivating an organization
+### 50. Generating organization client credentials
+### 51. Retrieving organization client credentials
+### 52. Getting an organization's activity feed
+### 53. Getting the applications in an organization
+### 54. Getting the admin users in an organization
+### 55. Removing an admin user from an organization
+### 56. Creating an organization application	
+### 57. Generating application credentials
+### 58. Getting application credentials
+
+## Managing Admin Users
+
+### 59. Creating an admin user
+### 60. Updating an admin user
+### 61. Getting an admin user
+### 62. Setting an admin user's password
+### 63. Resetting an admin user's password
+### 64. Activating an admin user
+### 65. Reactivating an admin user
+### 66. Getting an admin user's activity feed
+	
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/780e3f2f/docs/sdks/usage.md
----------------------------------------------------------------------
diff --git a/docs/sdks/usage.md b/docs/sdks/usage.md
deleted file mode 100644
index 2d2f139..0000000
--- a/docs/sdks/usage.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# SDKs & Tools
-
-## SDKs
-
-* [iOS SDK](https://github.com/apache/incubator-usergrid/tree/master/sdks/ios)
-* [Android SDK](https://github.com/apache/incubator-usergrid/tree/master/sdks/android)
-* [HTML5 / JavaScript SDK](https://github.com/apache/incubator-usergrid/tree/master/sdks/html5-javascript)
-* [Windows 8 / Windows Phone / .net SDK](https://github.com/apache/incubator-usergrid/tree/master/sdks/dotnet)
-* [Ruby gem](https://github.com/apache/incubator-usergrid/tree/master/sdks/ruby)
-* [Ruby on Rails gem](https://github.com/apache/incubator-usergrid/tree/master/sdks/ruby-on-rails)
-* [PHP library](https://github.com/apache/incubator-usergrid/tree/master/sdks/php)
-* [Java library](https://github.com/apache/incubator-usergrid/tree/master/sdks/java)
-* [Perl module](https://github.com/apache/incubator-usergrid/tree/master/sdks/perl)
-
-## Tools
-[ugc — the Command-line Client](https://github.com/apache/incubator-usergrid/tree/master/ugc#usergrid-command-line-ugc)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/780e3f2f/sdks/android/README.md
----------------------------------------------------------------------
diff --git a/sdks/android/README.md b/sdks/android/README.md
index 4fe667a..0218763 100755
--- a/sdks/android/README.md
+++ b/sdks/android/README.md
@@ -1,5 +1,4 @@
-Usergrid Android SDK Overview
-=======================
+# Android SDK 
 
 Installing the SDK
 --------------------

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/780e3f2f/sdks/html5-javascript/README.md
----------------------------------------------------------------------
diff --git a/sdks/html5-javascript/README.md b/sdks/html5-javascript/README.md
index 2b87573..bebc955 100755
--- a/sdks/html5-javascript/README.md
+++ b/sdks/html5-javascript/README.md
@@ -1,3 +1,5 @@
+# HTML5-JavaScript SDK
+
 ##Quickstart
 Detailed instructions follow but if you just want a quick example of how to get started with this SDK, here’s a minimal HTML5 file that shows you how to include & initialize the SDK, as well as how to read & write data from Usergrid with it.
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/780e3f2f/sdks/ios/README.md
----------------------------------------------------------------------
diff --git a/sdks/ios/README.md b/sdks/ios/README.md
index 2377222..b0ba069 100644
--- a/sdks/ios/README.md
+++ b/sdks/ios/README.md
@@ -1,3 +1,5 @@
+# iOS SDK
+
 ##Version
 
 Current Version: **0.9.2**
@@ -6,7 +8,6 @@ Change log:
 
 <https://github.com/apigee/usergrid-javascript-sdk/blob/master/changelog.md>
 
-
 ##Overview
 This open source SDK simplifies writing iOS applications that connect to App Services (Usergrid). The repo is located here:
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/780e3f2f/sdks/nodejs/readme.md
----------------------------------------------------------------------
diff --git a/sdks/nodejs/readme.md b/sdks/nodejs/readme.md
index f3342ee..b394551 100755
--- a/sdks/nodejs/readme.md
+++ b/sdks/nodejs/readme.md
@@ -1,3 +1,5 @@
+# Node.js SDK
+
 ##Version
 
 Current Version: **0.10.8**

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/780e3f2f/sdks/ruby/README.md
----------------------------------------------------------------------
diff --git a/sdks/ruby/README.md b/sdks/ruby/README.md
index d719a49..2f6c594 100644
--- a/sdks/ruby/README.md
+++ b/sdks/ruby/README.md
@@ -1,4 +1,4 @@
-# Usergrid_iron
+# Ruby SDK
 
 Usergrid_iron enables simple, low-level Ruby access to Apigee's App Services (aka Usergrid)
 REST API with minimal dependencies.

[07/60] [abbrv] incubator-usergrid git commit: cherry picking docs from master

[sn...@apache.org]

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/security-and-auth/revoking-tokens-logout.html
----------------------------------------------------------------------
diff --git a/content/docs/security-and-auth/revoking-tokens-logout.html b/content/docs/security-and-auth/revoking-tokens-logout.html
new file mode 100644
index 0000000..f9b899a
--- /dev/null
+++ b/content/docs/security-and-auth/revoking-tokens-logout.html
@@ -0,0 +1,342 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>Revoking tokens (logout) &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+        <link rel="next" title="Facebook sign in" href="facebook-sign.html"/>
+        <link rel="prev" title="Authenticating API requests" href="authenticating-api-requests.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">Revoking tokens (logout)</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#revoking-tokens-user-logout">Revoking tokens (user logout)</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#request-syntax">Request syntax</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#example-request">Example request</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#revoking-admin-user-tokens">Revoking admin user tokens</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>Revoking tokens (logout)</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/security-and-auth/revoking-tokens-logout.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="revoking-tokens-logout">
+<h1>Revoking tokens (logout)<a class="headerlink" href="#revoking-tokens-logout" title="Permalink to this headline">¶</a></h1>
+<p>Under certain circumstances, you may need to explicitly revoke one or
+more tokens associated with a user entity, such as when a user logs out
+of your app. This is accomplished by making a PUT request to the
+/revoketoken and /revoketokens endpoints.</p>
+<div class="section" id="revoking-tokens-user-logout">
+<h2>Revoking tokens (user logout)<a class="headerlink" href="#revoking-tokens-user-logout" title="Permalink to this headline">¶</a></h2>
+<p>If a user has been logged in using the Usergrid iOS, Android, JavaScript
+or node.JS SDKs, the returned token is automatically stored in the
+UsergridDataClient (iOS), DataClient (Android), Usergrid.Client
+(JavaScript), Usergrid.Client (node.JS) class instance. Calling the
+logout method of the SDK will destroy the token on the server, as well
+as in the client object.</p>
+<div class="section" id="request-syntax">
+<h3>Request syntax<a class="headerlink" href="#request-syntax" title="Permalink to this headline">¶</a></h3>
+<p>Revoke all tokens associated with a user entity</p>
+<div class="highlight-python"><div class="highlight"><pre>curl -X PUT https://api.usergrid.com/&lt;org_name&gt;/&lt;app_name&gt;/users/&lt;user_uuid_or_username&gt;/revoketokens
+</pre></div>
+</div>
+<p>Revoke a specific token associated with a user entity</p>
+<div class="highlight-python"><div class="highlight"><pre>curl -X PUT https://api.usergrid.com/&lt;org_name&gt;/&lt;app_name&gt;/users/&lt;user_uuid_or_username&gt;/revoketoken?token=&lt;token_to_revoke&gt;
+</pre></div>
+</div>
+</div>
+<div class="section" id="example-request">
+<h3>Example request<a class="headerlink" href="#example-request" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X PUT https://api.usergrid.com/your-org/your-app/users/someUser/revoketokens
+</pre></div>
+</div>
+<p>Example response</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+  <span class="s">&quot;action&quot;</span> <span class="p">:</span> <span class="s">&quot;revoked user token&quot;</span><span class="p">,</span>
+  <span class="s">&quot;timestamp&quot;</span> <span class="p">:</span> <span class="mi">1382050891455</span><span class="p">,</span>
+  <span class="s">&quot;duration&quot;</span> <span class="p">:</span> <span class="mi">24</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="revoking-admin-user-tokens">
+<h3>Revoking admin user tokens<a class="headerlink" href="#revoking-admin-user-tokens" title="Permalink to this headline">¶</a></h3>
+<p>The /revoketoken and /revoketokens endpoints also work for revoking
+admin user tokens by making a PUT request to /management/users//</p>
+</div>
+</div>
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+      
+        <a href="facebook-sign.html" class="btn btn-neutral float-right" title="Facebook sign in" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+      
+      
+        <a href="authenticating-api-requests.html" class="btn btn-neutral" title="Authenticating API requests" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+      
+    </div>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/security-and-auth/securing-your-app.html
----------------------------------------------------------------------
diff --git a/content/docs/security-and-auth/securing-your-app.html b/content/docs/security-and-auth/securing-your-app.html
new file mode 100644
index 0000000..f0638cf
--- /dev/null
+++ b/content/docs/security-and-auth/securing-your-app.html
@@ -0,0 +1,398 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>Security best practices &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+        <link rel="next" title="User management &amp; social graph" href="../user-management/user-management.html"/>
+        <link rel="prev" title="Facebook sign in" href="facebook-sign.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">Security best practices</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#never-use-the-sandbox-for-a-production-app">Never use the &#8216;sandbox&#8217; for a production app</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#review-permissions-in-your-apps">Review permissions in your apps</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#edit-the-default-role">Edit the &#8216;default&#8217; role</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#use-https">Use https</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#acquire-access-tokens-in-a-secure-way">Acquire access tokens in a secure way</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#treat-mobile-clients-as-untrustworthy">Treat mobile clients as untrustworthy</a></li>
+</ul>
+</li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>Security best practices</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/security-and-auth/securing-your-app.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="security-best-practices">
+<h1>Security best practices<a class="headerlink" href="#security-best-practices" title="Permalink to this headline">¶</a></h1>
+<p>There a number of actions you should take to ensure that your app is
+secure before you put it into production. The following is not an
+exhaustive list, but offers some common best practices you should
+consider following to keep your app secure when using the Usergrid.</p>
+<div class="section" id="never-use-the-sandbox-for-a-production-app">
+<h2>Never use the &#8216;sandbox&#8217; for a production app<a class="headerlink" href="#never-use-the-sandbox-for-a-production-app" title="Permalink to this headline">¶</a></h2>
+<p>By default, every new Usergrid account has an app named “sandbox” that
+is already created under your new organization. This app is no different
+than any other app that you might create, except that the Guest role has
+been given full permissions (that is, /** for GET, POST, PUT, and
+DELETE). This eliminates the need for a token when making application
+level calls, and can make it much easier to get your app up and running;
+however, it also means that any data in the sandbox application is
+completely unsecured.</p>
+<p>As with any other app, you can secure the sandbox application by
+updating its roles and permissions. For more on working with permissions
+and roles, see <a class="reference external" href="using-permissions.html">Using Permissions</a>.</p>
+</div>
+<div class="section" id="review-permissions-in-your-apps">
+<h2>Review permissions in your apps<a class="headerlink" href="#review-permissions-in-your-apps" title="Permalink to this headline">¶</a></h2>
+<p>Prior to launching your app into a production environment, it is
+advisable to review all the roles and permissions you have set up, as
+well as the groups and users you have assigned those permissions and
+roles to. During development, you may find that you added various
+permissions which may or may not still be required once the app is
+complete. Review all permissions and delete any that are no longer
+required.</p>
+<p>Prior to taking your app live, you should secure it by removing any
+unnecesary Guest permissions. (See <a class="reference external" href="using-permissions.html">Using
+Permissions</a> for further information about
+setting permissions.) After you secure your the app, any calls to the
+API will need to include an OAuth token. Oauth tokens (also called
+access tokens) are obtained by the API in response to successful
+authentication calls. Your app saves the token and uses it for all
+future calls during that session. Learn more about access tokens in
+Authenticating users and application clients.</p>
+</div>
+<div class="section" id="edit-the-default-role">
+<h2>Edit the &#8216;default&#8217; role<a class="headerlink" href="#edit-the-default-role" title="Permalink to this headline">¶</a></h2>
+<p>When preparing an application for production use, a good first step is
+to edit permission rules for the Default role. The permissions in this
+role will be applied to every user who authenticates with a valid access
+token.</p>
+<p>For example, in the Default role, you will most likely first want to
+remove the permission rule that grants full access to all authenticated
+users:</p>
+<div class="highlight-python"><div class="highlight"><pre>GET,PUT,POST,DELETE:/users/me/**
+</pre></div>
+</div>
+<p>For more on roles, see <a class="reference external" href="using-permissions.html">Using Permissions</a>.</p>
+<p>Review test accounts If you created any test user or test administrator
+accounts during development, these should also be reviewed for relevancy
+and security. Delete any test accounts that are no longer needed. If
+these accounts are still needed, make sure that passwords have been
+secured to the standards required by your app.</p>
+</div>
+<div class="section" id="use-https">
+<h2>Use https<a class="headerlink" href="#use-https" title="Permalink to this headline">¶</a></h2>
+<p>Make sure that any calls you make to the API are done using the secure
+https protocol, and not the insecure http protocol.</p>
+<p>If your app is a web app, that is, an app served by a web server, make
+sure that the app is served using https.</p>
+</div>
+<div class="section" id="acquire-access-tokens-in-a-secure-way">
+<h2>Acquire access tokens in a secure way<a class="headerlink" href="#acquire-access-tokens-in-a-secure-way" title="Permalink to this headline">¶</a></h2>
+<p>There are various methods for acquiring an access token (see
+<a class="reference external" href="authenticating-users-and-application-clients.html">Authenticating users and application
+clients</a>. One
+method is to use the application or organization level client
+secret-client id combination. This method should not be used in client
+applications (this is, apps that are deployed to a device, and which
+authenticate and make calls against the API).</p>
+<p>That’s because a hacker could analyze your app (even a compiled, binary
+distribution of your app), and retrieve the secret-id combination. Armed
+with this information, an attacker could gain full access to the data in
+your account.</p>
+<p>Instead, use application user credentials. This means that your app’s
+users should provide a username and password. Your app would use these
+to authenticate against the API and retrieve an access token.</p>
+<p>The client secret-client id combination should be used only in secure,
+server-side applications where there is no possibility of a hacker
+gaining control of the credentials.</p>
+</div>
+<div class="section" id="treat-mobile-clients-as-untrustworthy">
+<h2>Treat mobile clients as untrustworthy<a class="headerlink" href="#treat-mobile-clients-as-untrustworthy" title="Permalink to this headline">¶</a></h2>
+<p>For mobile access, it is recommended that you connect as an application
+user with configured access control policies. Mobile applications are
+inherently untrusted because they can be easily examined and even
+decompiled.</p>
+<p>Any credentials stored in a mobile app should be considered secure only
+to the Application User level. This means that if you don’t want the
+user to be able to access or delete data in your Usergrid application,
+you need to make sure that you don’t enable that capability through
+roles or permissions. Because most web applications talk to the database
+using some elevated level of permissions, such as root, it’s generally a
+good idea for mobile applications to connect with a more restricted set
+of permissions. For more information on restricting access through
+permission rules, see <a class="reference external" href="using-permissions.html">Using Permissions</a>.</p>
+</div>
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+      
+        <a href="../user-management/user-management.html" class="btn btn-neutral float-right" title="User management &amp; social graph" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+      
+      
+        <a href="facebook-sign.html" class="btn btn-neutral" title="Facebook sign in" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+      
+    </div>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/security-and-auth/user-authentication-types.html
----------------------------------------------------------------------
diff --git a/content/docs/security-and-auth/user-authentication-types.html b/content/docs/security-and-auth/user-authentication-types.html
new file mode 100644
index 0000000..7e8f76d
--- /dev/null
+++ b/content/docs/security-and-auth/user-authentication-types.html
@@ -0,0 +1,399 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>Authentication levels &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+        <link rel="next" title="Changing token expiration (time-to-live)" href="changing-token-time-live-ttl.html"/>
+        <link rel="prev" title="Authenticating users &amp; app clients" href="authenticating-users-and-application-clients.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">Authentication levels</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#configuring-authentication-levels">Configuring authentication levels</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#user-authentication-level">User authentication level</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#admin-authentication-levels">Admin authentication levels</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>Authentication levels</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/security-and-auth/user-authentication-types.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="authentication-levels">
+<h1>Authentication levels<a class="headerlink" href="#authentication-levels" title="Permalink to this headline">¶</a></h1>
+<p>Usergrid supports four levels of authentication, but only one of them is
+used when checking a registered user&#8217;s permissions. The other three
+levels are useful for authenticating other application or web clients
+that require higher-level access to your Usergrid application or
+organization. Because the scope of access that the other authentication
+levels provide is so broad (and as a result, so powerful), it&#8217;s a bad
+practice to use them from a mobile app. Instead, they&#8217;re better suited
+to other client apps, such as web applications.</p>
+<div class="section" id="configuring-authentication-levels">
+<h2>Configuring authentication levels<a class="headerlink" href="#configuring-authentication-levels" title="Permalink to this headline">¶</a></h2>
+<p>Access permissions can only be configured for the &#8216;application user&#8217; –
+this can be done both programmatically and in the admin portal. The
+application, organization and admin clients cannot be configured, and
+can only be accessed programmatically via the API.</p>
+<p>For more about creating and managing roles and permissions for
+application users, see Managing access by defining permission rules. For
+a look at how security features fit together, see App Security Overview.</p>
+</div>
+<div class="section" id="user-authentication-level">
+<h2>User authentication level<a class="headerlink" href="#user-authentication-level" title="Permalink to this headline">¶</a></h2>
+<table class="usergrid-table">
+<tr>
+    <th><p>Authentication Level</p>
+</th>
+    <th><p>Description</p>
+</th>
+</tr>
+<tr>
+    <td><p>Application user</p>
+</td>
+    <td><p>This is the standard authentication type you will use to implement user
+login for your app. The application user level allows access to your
+Usergrid application as governed by the permission rules you create and
+associated with users and user groups. For more on setting permissions
+see Managing access by defining permission rules. Each Application User
+is represented by a User entity in your Usergrid application. For more
+about the User entity, see User.</p>
+</td>
+</tr>
+</table></div>
+<div class="section" id="admin-authentication-levels">
+<h2>Admin authentication levels<a class="headerlink" href="#admin-authentication-levels" title="Permalink to this headline">¶</a></h2>
+<div class="admonition warning"> <p class="first admonition-title"><p>WARNING</p>
+  </p> <p class="last">
+
+
+Warning: Safe use of admin authentication levels. Never use client ID<p>and client secret, or any hard-coded credentials to authenticate this
+way from a client-side app, such as a mobile app. A hacker could analyze
+your app and extract the credentials for malicious use even if those
+credentials are compiled and in binary format. Even when authenticating
+with username and password, be cautious when using these authentication
+levels since they grant broad access to your Usergrid account. See &#8220;safe
+mobile access&#8221; in Authenticating API requests for additional
+considerations in keeping access to your app and its data secure.</p>
+</p></div>
+
+<table class="usergrid-table">
+<tr>
+    <th><p>Authentication Level</p>
+</th>
+    <th><p>Description</p>
+</th>
+</tr>
+<tr>
+   <td><p>Application client</p>
+</td>
+   <td><p>Grants full access to perform any operation on an Usergrid application
+(but not other applications within the same organization).</p>
+<p><p>Authentication at this level is useful in a server-side application (not
+a mobile app) that needs access to resources through the Usergrid API.
+For example, imagine you created a website that lists every hiking trail
+in the Rocky Mountains. You would want anyone to be able to view the
+content, but would not want them to access the Usergrid API and all your
+data directly. Instead, you would authenticate as an application client
+in your server-side code to access the data via the API in order to
+serve it to your website&#8217;s visitors.</p>
+</p></td>
+</tr>
+<tr>
+   <td><p>Organization client</p>
+</td>
+   <td><p>Grants full access to perform any operation on an Usergrid organization.</p>
+<p><p>This authentication level provides the greatest amount of access to an
+individual organization, allowing a client to perform any operation on
+an Usergrid organization and any applications in that organization. This
+level of access should be used sparingly and carefully.</p>
+</p></td>
+</tr>
+<tr>
+   <td><p>Admin user</p>
+</td>
+   <td><p>Allows full access to perform any operation on all organization accounts
+of which the admin user is a member.</p>
+<p><p>This authentication level is useful from applications that provide
+organization-wide administration features. For example, the Usergrid
+admin portal uses this level of access because it requires full access
+to the administration features.</p>
+</p><p>Unless you have a specific need for administrative features, such as to
+run test scripts that require access to management functionality, you
+should not use the admin user authentication level.</p>
+</td>
+</tr>
+</table></div>
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+      
+        <a href="changing-token-time-live-ttl.html" class="btn btn-neutral float-right" title="Changing token expiration (time-to-live)" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+      
+      
+        <a href="authenticating-users-and-application-clients.html" class="btn btn-neutral" title="Authenticating users &amp; app clients" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+      
+    </div>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/security-and-auth/using-permissions.html
----------------------------------------------------------------------
diff --git a/content/docs/security-and-auth/using-permissions.html b/content/docs/security-and-auth/using-permissions.html
new file mode 100644
index 0000000..9151f01
--- /dev/null
+++ b/content/docs/security-and-auth/using-permissions.html
@@ -0,0 +1,510 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>Using permissions &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+        <link rel="next" title="Authenticating users &amp; app clients" href="authenticating-users-and-application-clients.html"/>
+        <link rel="prev" title="Security &amp; token authentication" href="app-security.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">Using permissions</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#permissions-syntax">Permissions syntax</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#complex-paths">Complex paths</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#assigning-permissions">Assigning permissions</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#request-syntax">Request syntax</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#example-request">Example request</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#example-response">Example response</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#removing-permissions">Removing permissions</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#id1">Request syntax</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id2">Example request</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id3">Example response</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>Using permissions</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/security-and-auth/using-permissions.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="using-permissions">
+<h1>Using permissions<a class="headerlink" href="#using-permissions" title="Permalink to this headline">¶</a></h1>
+<p>Permissions allow you to define user access to perform GET, POST, PUT,
+or DELETE operations on specific resources. When the user submits a
+request via your app code to the Usergrid API, the user’s permissions
+are checked against the resource paths that the user is trying to
+access. The request succeeds only if access to the resource is allowed
+by the permission rules you specify.</p>
+<div class="section" id="permissions-syntax">
+<h2>Permissions syntax<a class="headerlink" href="#permissions-syntax" title="Permalink to this headline">¶</a></h2>
+<p>In Usergrid, permissions are represented in the following format:</p>
+<div class="highlight-python"><div class="highlight"><pre>&lt;operations&gt;:&lt;resource_path&gt;
+</pre></div>
+</div>
+<ul class="simple">
+<li><code class="docutils literal"><span class="pre">&lt;operations&gt;</span></code>: A comma-delimited set of HTTP methods (<code class="docutils literal"><span class="pre">GET</span></code>,
+<code class="docutils literal"><span class="pre">PUT</span></code>, <code class="docutils literal"><span class="pre">POST</span></code>, <code class="docutils literal"><span class="pre">DELETE</span></code>) that are allowed for the specified
+resource path. For example, <code class="docutils literal"><span class="pre">get</span></code>, <code class="docutils literal"><span class="pre">post</span></code> would allow only
+<code class="docutils literal"><span class="pre">GET</span></code> and <code class="docutils literal"><span class="pre">POST</span></code> requests to be made to the specified resource.</li>
+<li><code class="docutils literal"><span class="pre">&lt;resource_path&gt;</span></code>: The path to the resources to be accessed. For
+example, <code class="docutils literal"><span class="pre">/users</span></code> would apply the permission to the users
+collection, while <code class="docutils literal"><span class="pre">/users/Tom</span></code> would apply the permission to only
+the user entity with username &#8216;Tom&#8217;.</li>
+</ul>
+</div>
+<div class="section" id="complex-paths">
+<h2>Complex paths<a class="headerlink" href="#complex-paths" title="Permalink to this headline">¶</a></h2>
+<p>Complex paths can be defined using <a class="reference external" href="http://ant.apache.org/manual/dirtasks.html#patterns">Apache Ant pattern
+syntax</a>. The
+following special path variables are supported for the construction of
+complex paths:</p>
+<table>
+<tr>
+   <td><p>Parameter</p>
+</td>
+   <td><p>Description</p>
+</td>
+</tr>
+<tr>
+   <td><p>*</p>
+</td>
+   <td><p>Treated as a wildcard. Assigns the permission to all paths at the
+specified level in the path hierarchy. For example, <code class="docutils literal"><span class="pre">/*</span></code> would match
+any collection, while <code class="docutils literal"><span class="pre">/users/Tom/*</span></code> would match /users/Tom/likes and
+<code class="docutils literal"><span class="pre">/users/Tom/owns</span></code>.</p>
+</td>
+</tr>
+<tr>
+   <td><p>**</p>
+</td>
+   <td><p>Assigns the permission to the path recursively. For example,
+<code class="docutils literal"><span class="pre">**/likes</span></code> would match <code class="docutils literal"><span class="pre">/likes</span></code> and <code class="docutils literal"><span class="pre">/users/likes</span></code>, while
+<code class="docutils literal"><span class="pre">/users/**</span></code> would match <code class="docutils literal"><span class="pre">/users</span></code> and <code class="docutils literal"><span class="pre">/users/likes</span></code>.</p>
+</td>
+</tr>
+<tr>
+   <td><p>${user}</p>
+</td>
+   <td><p>Automatically sets the path segment to the UUID of the currently
+authenticated user. For example, if you sent a request with a valid
+access token for a user with UUID
+<code class="docutils literal"><span class="pre">bd397ea1-a71c-3249-8a4c-62fd53c78ce7</span></code>, the path <code class="docutils literal"><span class="pre">/users/${user}</span></code>
+would be interpreted as <code class="docutils literal"><span class="pre">/users/bd397ea1-a71c-3249-8a4c-62fd53c78ce7</span></code>,
+assigning the permission only to that user entity.</p>
+</td>
+</tr>
+</table></div>
+<div class="section" id="assigning-permissions">
+<h2>Assigning permissions<a class="headerlink" href="#assigning-permissions" title="Permalink to this headline">¶</a></h2>
+<p>Permissions can only be assigned to user, group or role entities.
+Assigning permissions to roles can be particularly useful, as it allows
+you to create sets of permissions that represent complex access
+definitions, which can then be assigned to user and group entities. For
+more on roles, see Using roles.</p>
+<div class="section" id="request-syntax">
+<h3>Request syntax<a class="headerlink" href="#request-syntax" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X POST https://api.usergrid.com/&lt;org&gt;/&lt;app&gt;/&lt;collection&gt;/&lt;entity&gt;/permissions -d &#39;{&quot;permission&quot;:&lt;permissions&gt;}&#39;
+</pre></div>
+</div>
+<p>Parameters</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="11%" />
+<col width="89%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>org</td>
+<td>Organization UUID or organization name</td>
+</tr>
+<tr class="row-odd"><td>app</td>
+<td>Application UUID or application name</td>
+</tr>
+<tr class="row-even"><td>collection</td>
+<td>The collection of the entity that the permissions are to be assigned to.</td>
+</tr>
+<tr class="row-odd"><td>entity</td>
+<td>The UUID of the entity to assign the permissions to. For users, username and for groups, name are also accepted.</td>
+</tr>
+<tr class="row-even"><td>permissions</td>
+<td>The permissions to assign to the entity. See Permissions syntax for format.</td>
+</tr>
+</tbody>
+</table>
+<p>For collections, Valid values are users and groups.</p>
+</div>
+<div class="section" id="example-request">
+<h3>Example request<a class="headerlink" href="#example-request" title="Permalink to this headline">¶</a></h3>
+<p>For example, the following cURL request would give the user &#8216;Tom&#8217; POST
+permission to the /users collection:</p>
+<div class="highlight-python"><div class="highlight"><pre>curl -X POST https://api.usergrid.com/your-org/your-app/users/Tom/permissions -d &#39;{&quot;permission&quot;:&quot;post:/users&quot;}&#39;
+</pre></div>
+</div>
+</div>
+<div class="section" id="example-response">
+<h3>Example response<a class="headerlink" href="#example-response" title="Permalink to this headline">¶</a></h3>
+<p>The newly assigned permission is returned in the data property of the
+response:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+  <span class="s">&quot;action&quot;</span> <span class="p">:</span> <span class="s">&quot;post&quot;</span><span class="p">,</span>
+  <span class="s">&quot;application&quot;</span> <span class="p">:</span> <span class="s">&quot;f34f4222-a166-11e2-a7f7-02e81adcf3d0&quot;</span><span class="p">,</span>
+  <span class="s">&quot;params&quot;</span> <span class="p">:</span> <span class="p">{</span> <span class="p">},</span>
+  <span class="s">&quot;uri&quot;</span> <span class="p">:</span> <span class="s">&quot;https://api.usergrid.com/your-org/your-app&quot;</span><span class="p">,</span>
+  <span class="s">&quot;entities&quot;</span> <span class="p">:</span> <span class="p">[</span> <span class="p">],</span>
+  <span class="s">&quot;data&quot;</span> <span class="p">:</span> <span class="p">[</span> <span class="s">&quot;post:/users&quot;</span> <span class="p">],</span>
+  <span class="s">&quot;timestamp&quot;</span> <span class="p">:</span> <span class="mi">1402349612382</span><span class="p">,</span>
+  <span class="s">&quot;duration&quot;</span> <span class="p">:</span> <span class="mi">19</span><span class="p">,</span>
+  <span class="s">&quot;organization&quot;</span> <span class="p">:</span> <span class="s">&quot;your-org&quot;</span><span class="p">,</span>
+  <span class="s">&quot;applicationName&quot;</span> <span class="p">:</span> <span class="s">&quot;your-app&quot;</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+</div>
+<div class="section" id="removing-permissions">
+<h2>Removing permissions<a class="headerlink" href="#removing-permissions" title="Permalink to this headline">¶</a></h2>
+<p>Using a DELETE request, you can remove one of more permissions from a
+user, group, or role entity.</p>
+<div class="section" id="id1">
+<h3>Request syntax<a class="headerlink" href="#id1" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X DELETE https://api.usergrid.com/&lt;org&gt;/&lt;app&gt;/&lt;collection&gt;/&lt;entity&gt;/permissions?=&lt;permissions&gt;
+</pre></div>
+</div>
+<p>Parameters</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="11%" />
+<col width="89%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>org</td>
+<td>Organization UUID or organization name</td>
+</tr>
+<tr class="row-odd"><td>app</td>
+<td>Application UUID or application name</td>
+</tr>
+<tr class="row-even"><td>collection</td>
+<td>The collection of the entity that the permissions are to be assigned to. Valid values are users and groups.</td>
+</tr>
+<tr class="row-odd"><td>entity</td>
+<td>The UUID of the entity to assign the permissions to. For users, username and for groups, name are also accepted.</td>
+</tr>
+<tr class="row-even"><td>permissions</td>
+<td>The permissions to assign to the entity. See <a class="reference external" href="using-permissions.html">Permissions syntax</a> for format.</td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="section" id="id2">
+<h3>Example request<a class="headerlink" href="#id2" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X DELETE https://api.usergrid.com/your-org/your-app/users/Tom/permissions?permission=post:/users
+</pre></div>
+</div>
+</div>
+<div class="section" id="id3">
+<h3>Example response<a class="headerlink" href="#id3" title="Permalink to this headline">¶</a></h3>
+<p>The deleted permission is returned in the params.permission property of
+the response:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+  <span class="s">&quot;action&quot;</span> <span class="p">:</span> <span class="s">&quot;delete&quot;</span><span class="p">,</span>
+  <span class="s">&quot;application&quot;</span> <span class="p">:</span> <span class="s">&quot;f34f4222-a166-11e2-a7f7-02e81adcf3d0&quot;</span><span class="p">,</span>
+  <span class="s">&quot;params&quot;</span> <span class="p">:</span> <span class="p">{</span>
+    <span class="s">&quot;permission&quot;</span> <span class="p">:</span> <span class="p">[</span> <span class="s">&quot;post:/users&quot;</span> <span class="p">]</span>
+  <span class="p">},</span>
+  <span class="s">&quot;uri&quot;</span> <span class="p">:</span> <span class="s">&quot;https://api.usergrid.com/your-org/your-app&quot;</span><span class="p">,</span>
+  <span class="s">&quot;entities&quot;</span> <span class="p">:</span> <span class="p">[</span> <span class="p">],</span>
+  <span class="s">&quot;data&quot;</span> <span class="p">:</span> <span class="p">[</span> <span class="s">&quot;post:/assets&quot;</span> <span class="p">],</span>
+  <span class="s">&quot;timestamp&quot;</span> <span class="p">:</span> <span class="mi">1402349951530</span><span class="p">,</span>
+  <span class="s">&quot;duration&quot;</span> <span class="p">:</span> <span class="mi">20</span><span class="p">,</span>
+  <span class="s">&quot;organization&quot;</span> <span class="p">:</span> <span class="s">&quot;your-org&quot;</span><span class="p">,</span>
+  <span class="s">&quot;applicationName&quot;</span> <span class="p">:</span> <span class="s">&quot;your-app&quot;</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+</div>
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+      
+        <a href="authenticating-users-and-application-clients.html" class="btn btn-neutral float-right" title="Authenticating users &amp; app clients" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+      
+      
+        <a href="app-security.html" class="btn btn-neutral" title="Security &amp; token authentication" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+      
+    </div>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

[51/60] [abbrv] incubator-usergrid git commit: Fix broken links and add missing references.

[sn...@apache.org]

Fix broken links and add missing references.

(cherry picked from commit 6b144189aba9de1d6ca1a8c95f41f789583e0f5b)


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/64687d1c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/64687d1c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/64687d1c

Branch: refs/heads/two-dot-o-dev
Commit: 64687d1c748c66d8828c00989d483a3e1367ff7f
Parents: cbd78b6
Author: Dave Johnson <sn...@apache.org>
Authored: Fri Aug 7 13:51:15 2015 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Wed Aug 12 13:02:48 2015 -0400

----------------------------------------------------------------------
 docs/README.md                       |   2 +-
 docs/_static/css/theme.css           | 164 +++---------------------------
 docs/data-storage/data-store-dbms.md |   8 +-
 docs/index.rst                       |   5 +-
 docs/introduction/data-model.md      |  28 ++---
 docs/introduction/overview.md        |  17 ++++
 docs/orgs-and-apps/admin-user.md     |   2 +-
 7 files changed, 55 insertions(+), 171 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/64687d1c/docs/README.md
----------------------------------------------------------------------
diff --git a/docs/README.md b/docs/README.md
index 07ab32b..2f7888c 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -65,6 +65,6 @@ __NOTE__: Mustache.hava is not in Maven Central so unfortunately, you will have
 
 This is the command to run the generation:
 
-	groovy src/main/groovy/usergrid.ApiDocGenerator.groovy
+	groovy src/main/groovy/usergrid/ApiDocGenerator.groovy
 	
 The script will update the file ``rest-endpoints/api-docs.md`` and when you are happy with your update you should commit and push that file with Git.

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/64687d1c/docs/_static/css/theme.css
----------------------------------------------------------------------
diff --git a/docs/_static/css/theme.css b/docs/_static/css/theme.css
index f225469..b0b1c33 100755
--- a/docs/_static/css/theme.css
+++ b/docs/_static/css/theme.css
@@ -5314,9 +5314,9 @@ span[id*='MathJax-Span'] {
 
 /*# sourceMappingURL=theme.css.map */
 
-/* Usergrid specific */
+/* Start - Usergrid Additions */
 
-.usergrid-table {
+.usergrid-table, docutils {
     border: 1px solid grey;
     margin-bottom: 2em;
 }
@@ -5331,6 +5331,10 @@ span[id*='MathJax-Span'] {
     font-size: 80%;
 }
 
+.usergrid-table th, .docutils th {
+    background-color: #e5ebeb;
+}
+
 .caption-text {
     font-size:140%;
 }
@@ -5360,159 +5364,21 @@ h2.usergrid-DELETE-heading {
     margin-bottom: 2em;
 }
 
-/* css from petstore example 
-
-body {
-    font-family: Trebuchet MS, sans-serif;
+div.wy-menu-vertical li {
     font-size: 15px;
-    color: #444;
-    margin-right: 24px;
+    margin-bottom: 0.0em;
+    margin-left: 1.5em;
 }
 
-h1	{
-    font-size: 25px;
-}
-h2	{
-    font-size: 20px;
-}
-h3	{
+ul.simple li, ol.simple li {
     font-size: 16px;
-    font-weight: bold;
-}
-hr	{
-    height: 1px;
-    border: 0;
-    color: #ddd;
-    background-color: #ddd;
-    display: none;
-}
-
-.app-desc {
-    clear: both;
-    margin-left: 20px;
-}
-.param-name {
-    width: 100%;
-}
-.license-info {
-    margin-left: 20px;
-}
-
-.license-url {
-    margin-left: 20px;
-}
-
-.model {
-    margin: 0 0 0px 20px;
-}
-
-.method {
-    margin-left: 20px;
-}
-
-.method-notes	{
-    margin: 10px 0 20px 0;
-    font-size: 90%;
-    color: #555;
-}
-
-pre {
-    padding: 10px;
-    margin-bottom: 2px;
+    margin-top: 0.5em;
+    margin-bottom: 0.5em;
 }
 
-pre.get {
-    background-color: #0f6ab4;
-}
-
-pre.post {
-    background-color: #10a54a;
-}
-
-pre.put {
-    background-color: #c5862b;
-}
-
-pre.delete {
-    background-color: #a41e22;
-}
-
-.huge	{
-    color: #fff;
-}
-
-pre.example {
-    background-color: #f3f3f3;
-    padding: 10px;
-    border: 1px solid #ddd;
-}
-
-code {
-    white-space: pre;
-}
-
-.nickname {
-    font-weight: bold;
-}
-
-.method-path {
-    font-size: 1.5em;
-    background-color: #0f6ab4;
-}
-
-.parameter {
-    width: 500px;
-}
-
-.param {
-    width: 500px;
-    padding: 10px 0 0 20px;
-    font-weight: bold;
-}
-
-.param-desc {
-    width: 700px;
-    padding: 0 0 0 20px;
-    color: #777;
-}
-
-.param-type {
-    font-style: italic;
-}
-
-.field-label {
-    padding: 0;
-    margin: 0;
-    clear: both;
-}
-
-.field-items	{
-    padding: 0 0 15px 0;
-    margin-bottom: 15px;
-}
-
-.return-type {
-    clear: both;
-    padding-bottom: 10px;
-}
-
-.param-header {
-    font-weight: bold;
-}
-
-.method-tags {
-    text-align: right;
-}
-
-.method-tag {
-    background: none repeat scroll 0% 0% #24A600;
-    border-radius: 3px;
-    padding: 2px 10px;
-    margin: 2px;
-    color: #FFF;
-    display: inline-block;
-    text-decoration: none;
+h1 p {
+    font-size:150%; 
 }
 
-*/
+/* End - Usergrid Additions */
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/64687d1c/docs/data-storage/data-store-dbms.md
----------------------------------------------------------------------
diff --git a/docs/data-storage/data-store-dbms.md b/docs/data-storage/data-store-dbms.md
index 0ea09d4..56fbbdb 100644
--- a/docs/data-storage/data-store-dbms.md
+++ b/docs/data-storage/data-store-dbms.md
@@ -20,10 +20,10 @@ If you have experience with relational databases and are unfamiliar with "NoSQL"
 
 <table class="usergrid-table">
 <tr>
-    <td></td>
-    <td>RDBMS</td>
-    <td>Cassandra</td>
-    <td>Usergrid</td>
+    <th></th>
+    <th>RDBMS</th>
+    <th>Cassandra</th>
+    <th>Usergrid</th>
 </tr>
 <tr>
     <td>Each tuple is modeled as</td>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/64687d1c/docs/index.rst
----------------------------------------------------------------------
diff --git a/docs/index.rst b/docs/index.rst
index bcb3092..1afd267 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -8,6 +8,7 @@ Apache Usergrid Documentation
    :maxdepth: 2
    :caption: Introduction
 
+   introduction/overview.md
    introduction/usergrid-features
    introduction/data-model
    introduction/async-vs-sync
@@ -122,7 +123,7 @@ Apache Usergrid Documentation
    orgs-and-apps/managing
    orgs-and-apps/organization
    orgs-and-apps/application
-   orgs-and-apps/adminuser
+   orgs-and-apps/admin-user
   
 .. _rest-endpoints:
 
@@ -139,7 +140,7 @@ Apache Usergrid Documentation
    :caption: Client SDKs
 
    sdks/tbd
-   
+      
 .. _installation:
 
 .. toctree::

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/64687d1c/docs/introduction/data-model.md
----------------------------------------------------------------------
diff --git a/docs/introduction/data-model.md b/docs/introduction/data-model.md
index 111e225..41421bd 100644
--- a/docs/introduction/data-model.md
+++ b/docs/introduction/data-model.md
@@ -33,20 +33,20 @@ Here is a simple example of an entity:
     }
     
 ## Default entities
-The following entity types are predefined in Usergrid. For more details, see Default Data Entity Types.
-
-* user
-* group
-* role
-* application
-* activity
-* device
-* asset
-* folder
-* event
-* notifier
-* notification
-* receipt
+The following entity types are predefined in Usergrid. For more details, see the [API Reference](../rest-endpoints/api-docs.html)
+
+* [user](../rest-endpoints/api-docs.html#user)
+* [group](../rest-endpoints/api-docs.html#group)
+* [role](../rest-endpoints/api-docs.html#role)
+* [application](../rest-endpoints/api-docs.html#application)
+* [activity](../rest-endpoints/api-docs.html#activity)
+* [device](../rest-endpoints/api-docs.html#device)
+* [asset](../rest-endpoints/api-docs.html#asset)
+* [folder](../rest-endpoints/api-docs.html#folder)
+* [event](../rest-endpoints/api-docs.html#event)
+* [notifier](../rest-endpoints/api-docs.html#notifier)
+* [notification](../rest-endpoints/api-docs.html#notification)
+* [receipt](../rest-endpoints/api-docs.html#recept)
 
 ## Properties
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/64687d1c/docs/introduction/overview.md
----------------------------------------------------------------------
diff --git a/docs/introduction/overview.md b/docs/introduction/overview.md
new file mode 100644
index 0000000..e9c6968
--- /dev/null
+++ b/docs/introduction/overview.md
@@ -0,0 +1,17 @@
+# Documentation Overview
+
+The Usergrid documentation is written for a couple of distinctly different audiences:
+
+* __Application Developer__: this is you if you are a Javascript, iOS, Android, Java or other developer who wants to build an app that uses the Usergrid APIs for data storage, user management, authentication, etc. __Most of our docs are written for application developers__ so browse the left side-bar and work your way down the topics list.
+
+
+* __Deployment/Operations Engineer__: this is for you if you are the person who will be installing Usergrid, setting up the required Cassandra database and other things that Usergrid needs. Currently, we have limited docs for installation, deployment and maintenance of Usergrid:
+    * [Deploying to Tomcat](../ug1-deploy-to-tomacat): How to build and deploy Usergrid to Tomcat and Cassandra.
+    * [Launcher Quick Start](../ug1-launcher-quick-start): How to build and run Usergrid via the Usergrid Launcher.
+    
+    
+* __Open Source Contributor__: How to "give back" and contribute to Usergrid. Usergrid welcomes code and documentation contributions, GitHub pull-requests, bug reports and suggestions for improvement.  
+    * [How to Contribute Code & Docs](../reference/contribute-code):
+
+
+

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/64687d1c/docs/orgs-and-apps/admin-user.md
----------------------------------------------------------------------
diff --git a/docs/orgs-and-apps/admin-user.md b/docs/orgs-and-apps/admin-user.md
index 87b96f9..6b1b7d3 100644
--- a/docs/orgs-and-apps/admin-user.md
+++ b/docs/orgs-and-apps/admin-user.md
@@ -1,4 +1,4 @@
-# Admin user$
+# Admin user
 An admin user has full access to perform any operation on all organization accounts of which the admin user is a member. Using the API Services BaaS API, you can create, update, or retrieve an admin user. You can also set or reset an admin user's password, activite or reactivate an admin user, and get an admin user's activity feed.
 
 In addition, you can add,  retrieve, or remove an admin user from an organization. For information on these organization-related operations, see [Organization](organization.html).

[31/60] [abbrv] incubator-usergrid git commit: cherry picking docs from master

[sn...@apache.org]

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_static/css/theme.css.map
----------------------------------------------------------------------
diff --git a/content/docs/_static/css/theme.css.map b/content/docs/_static/css/theme.css.map
new file mode 100644
index 0000000..2ee14e0
--- /dev/null
+++ b/content/docs/_static/css/theme.css.map
@@ -0,0 +1,7 @@
+{
+"version": 3,
+"mappings": "CACE,AAAE,ECQI,iBAAoB,EDPJ,SAAU,ECY1B,cAAiB,EDZD,SAAU,EC2B1B,SAAY,ED3BI,SAAU,EEFlC,uEAAiF,EAC/E,MAAO,EAAE,IAAK,EAEhB,iBAAoB,EAClB,MAAO,EAAE,WAAY,EACrB,OAAQ,EAAE,KAAM,EAChB,IAAK,EAAE,AAAC,EAEV,oBAAqB,EACnB,MAAO,EAAE,GAAI,EAEf,OAAQ,EACN,MAAO,EAAE,GAAI,EAEf,AAAC,EDLO,iBAAoB,ECMd,SAAU,EDDhB,cAAiB,ECCX,SAAU,EDchB,SAAY,ECdN,SAAU,EAExB,GAAI,EACF,QAAS,EAAE,GAAI,EACf,uBAAwB,EAAE,GAAI,EAC9B,mBAAoB,EAAE,GAAI,EAE5B,GAAI,EACF,KAAM,EAAE,AAAC,EAEX,eAAiB,EACf,MAAO,EAAE,AAAC,EAEZ,UAAW,EACT,YAAa,EAAE,SAAU,EAE3B,OAAS,EACP,UAAW,EAAE,GAAI,EAEnB,SAAU,EACR,KAAM,EAAE,AAAC,EAEX,EAAG,EACD,SAAU,EAAE,KAAM,EAGpB,EAAG,EACD,SAAU,EAAE,GAAI,EAChB,IAAK,EAAE,GAAI,EACX,cAAe,EAAE,GAAI,EAEvB,GAAI,EACF,SAAU,EAAE,GAAI,EAChB,IAAK,EAAE,GAAI,EACX,SAAU,EAAE,KAAM,EAClB,UAAW,EAAE,GAAI,EAEnB,kDAAoB,EAClB,UAAW,EAAE,cAAS,EACtB,WAAY,EAAE,sBAAa,EAC3B,QAAS,EAAE,EAAG,EAEhB,EAAG,EACD,UAAW,EAAE,EAAG,EAElB,AAAC,EACC,KAAM,EAAE,GAAI,EAEd,eAAiB,EACf,MAAO,EAAE,CAAE,EACX,MAAO,EAAE,GAAI,EAEf,IAAK,EACH,QAAS,EAAE,EAAG,EAEhB,MAAQ,EAC
 N,QAAS,EAAE,EAAG,EACd,UAAW,EAAE,AAAC,EACd,OAAQ,EAAE,OAAQ,EAClB,aAAc,EAAE,OAAQ,EAE1B,EAAG,EACD,EAAG,EAAE,KAAM,EAEb,EAAG,EACD,KAAM,EAAE,MAAO,EAEjB,OAAU,EACR,KAAM,EAAE,AAAC,EACT,MAAO,EAAE,AAAC,EACV,SAAU,EAAE,GAAI,EAChB,eAAgB,EAAE,GAAI,EAExB,CAAE,EACA,SAAU,EAAE,GAAI,EAElB,CAAE,EACA,KAAM,EAAE,AAAC,EAEX,EAAG,EACD,KAAM,EAAE,AAAC,EACT,qBAAsB,EAAE,MAAO,EAC/B,aAAc,EAAE,KAAM,EACtB,QAAS,EAAE,GAAI,EAEjB,aAAc,EACZ,OAAQ,EAAE,KAAM,EAElB,KAAM,EACJ,KAAM,EAAE,AAAC,EAEX,GAAI,EACF,KAAM,EAAE,AAAC,EAEX,OAAQ,EACN,KAAM,EAAE,AAAC,EACT,KAAM,EAAE,AAAC,EACT,MAAO,EAAE,AAAC,EAEZ,IAAK,EACH,KAAM,EAAE,MAAO,EAEjB,KAAM,EACJ,KAAM,EAAE,AAAC,EACT,WAAY,EAAE,GAAI,EAClB,MAAO,EAAE,AAAC,EACV,UAAW,EAAE,KAAM,EAErB,2BAA+B,EAC7B,QAAS,EAAE,GAAI,EACf,KAAM,EAAE,AAAC,EACT,aAAc,EAAE,OAAQ,EACxB,cAAe,EAAE,KAAM,EAEzB,WAAa,EACX,UAAW,EAAE,KAAM,EAErB,mEAAuE,EACrE,KAAM,EAAE,MAAO,EACf,iBAAkB,EAAE,KAAM,EAC1B,QAAS,EAAE,MAAO,EAEpB,+BAAiC,EAC/B,KAAM,EAAE,MAAO,EAEjB,yCAA2C,EACzC,SAAU,EAAE,SAAU,EACtB,MAAO,EAAE,AAAC,EACV,KAAM,EAAE,GAAI,EACZ,MAAO,EAA
 E,GAAI,EAEf,mBAAoB,EAClB,iBAAkB,EAAE,QAAS,EAC7B,cAAe,EAAE,UAAW,EAC5B,iBAAkB,EAAE,UAAW,EAC/B,SAAU,EAAE,UAAW,EAEzB,iGAAmG,EACjG,iBAAkB,EAAE,GAAI,EAE1B,+CAAiD,EAC/C,KAAM,EAAE,AAAC,EACT,MAAO,EAAE,AAAC,EAEZ,OAAQ,EACN,OAAQ,EAAE,GAAI,EACd,aAAc,EAAE,EAAG,EACnB,KAAM,EAAE,OAAQ,EAElB,IAAK,EACH,cAAe,EAAE,OAAQ,EACzB,aAAc,EAAE,AAAC,EAEnB,CAAE,EACA,aAAc,EAAE,EAAG,EAErB,WAAY,EACV,KAAM,EAAE,MAAO,EACf,SAAU,EAAE,GAAI,EAChB,IAAK,EAAE,GAAK,EACZ,MAAO,EAAE,MAAO,EAElB,EAAG,EACD,MAAO,EAAE,IAAK,EACd,KAAM,EAAE,AAAC,EACT,UAAW,EAAE,KAAM,EACnB,OAAQ,EAAE,KAAM,EAChB,eAAgB,EAAE,UAAW,EAC7B,gBAAiB,EAAE,QAAS,EAC5B,SAAU,EAAE,GAAI,EAChB,QAAS,EAAE,EAAG,EACd,WAAY,EAAE,AAAC,EAEjB,KAAM,EACJ,MAAO,EAAE,GAAI,EAEf,MAAO,EACL,MAAO,EAAE,cAAe,EACxB,SAAU,EAAE,KAAM,EAEpB,cAAe,EACb,KAAM,EAAE,AAAC,EACT,GAAI,EAAE,YAAa,EACnB,KAAM,EAAE,EAAG,EACX,KAAM,EAAE,GAAI,EACZ,OAAQ,EAAE,KAAM,EAChB,MAAO,EAAE,AAAC,EACV,OAAQ,EAAE,OAAQ,EAClB,IAAK,EAAE,EAAG,EAEZ,+DAAiE,EAC/D,GAAI,EAAE,GAAI,EACV,KAAM,EAAE,GAAI,EACZ,KAAM,EAAE,AAAC,EACT,OAAQ,EAAE,MAAO,EACjB,
 OAAQ,EAAE,KAAM,EAChB,IAAK,EAAE,GAAI,EAEb,SAAU,EACR,SAAU,EAAE,KAAM,EAEpB,QAAS,EACP,OAAQ,EAAE,OAAQ,EAEpB,QAAU,EACR,QAAS,EAAE,GAAI,EAEjB,WAAY,EACV,gBAAmB,EACjB,SAAU,EAAE,cAAe,EAC7B,AAAC,EACC,SAAU,EAAE,cAAe,EAC3B,UAAW,EAAE,cAAe,EAC5B,KAAM,EAAE,cAAe,EACvB,SAAU,EAAE,cAAe,EAC7B,UAAY,EACV,cAAe,EAAE,QAAS,EAC5B,0DAA6D,EAC3D,MAAO,EAAE,CAAE,EACb,aAAe,EACb,gBAAiB,EAAE,IAAK,EAC1B,IAAK,EACH,MAAO,EAAE,iBAAkB,EAC7B,KAAO,EACL,gBAAiB,EAAE,IAAK,EAC1B,EAAG,EACD,QAAS,EAAE,cAAe,QAE1B,KAAM,EAAE,IAAK,EAEf,8CAAS,EACP,MAAO,EAAE,AAAC,EACV,KAAM,EAAE,AAAC,EACX,4CAAM,EACJ,eAAgB,EAAE,IAAK,GChM3B,ykDAAY,EACV,qBAAsB,EAAE,UAAW,EAqDrC,QAAS,EARP,IAAK,EAAE,AAAC,EACR,+BAAS,EAEP,MAAO,EAAE,IAAK,EACd,MAAO,EAAE,CAAE,EACb,cAAO,EACL,IAAK,EAAE,GAAI;;;GC1Gf,UAUC,CATC,WAAW,CAAE,aAAa,CAC1B,GAAG,CAAE,+CAAgE,CACrE,GAAG,CAAE,sSAAmG,CAKxG,WAAW,CAAE,MAAM,CACnB,UAAU,CAAE,MAAM,CCTpB,kfAAmB,CACjB,OAAO,CAAE,YAAY,CACrB,IAAI,CAAE,uCAAuC,CAC7C,SAAS,CAAE,OAAO,CAClB,cAAc,CAAE,IAAI,CACpB,sBAAsB,CAAE,WAAW,CACnC,uBAAuB,CAAE,SAAS,CCLpC,MAAsB,CACpB,
 SAAS,CAAE,SAAS,CACpB,WAAW,CAAE,MAAS,CACtB,cAAc,CAAE,IAAI,CAEtB,MAAsB,CAAE,SAAS,CAAE,GAAG,CACtC,MAAsB,CAAE,SAAS,CAAE,GAAG,CACtC,MAAsB,CAAE,SAAS,CAAE,GAAG,CACtC,MAAsB,CAAE,SAAS,CAAE,GAAG,CCVtC,MAAsB,CACpB,KAAK,CAAE,SAAW,CAClB,UAAU,CAAE,MAAM,CCDpB,MAAsB,CACpB,YAAY,CAAE,CAAC,CACf,WAAW,CCIU,SAAS,CDH9B,eAAe,CAAE,IAAI,CACrB,SAAK,CAAE,QAAQ,CAAE,QAAQ,CAE3B,MAAsB,CACpB,QAAQ,CAAE,QAAQ,CAClB,IAAI,CAAE,UAAa,CACnB,KAAK,CCHgB,SAAS,CDI9B,GAAG,CAAE,SAAU,CACf,UAAU,CAAE,MAAM,CAClB,YAAuB,CACrB,IAAI,CAAE,UAA0B,CEbpC,UAA0B,CACxB,OAAO,CAAE,gBAAgB,CACzB,MAAM,CAAE,iBAA4B,CACpC,aAAa,CAAE,IAAI,CAGrB,WAAY,CAAE,KAAK,CAAE,KAAK,CAC1B,UAAW,CAAE,KAAK,CAAE,IAAI,CAGtB,kpBAAY,CAAE,YAAY,CAAE,IAAI,CAChC,kqBAAa,CAAE,WAAW,CAAE,IAAI,CCXlC,QAAwB,CACtB,iBAAiB,CAAE,0BAA0B,CACrC,SAAS,CAAE,0BAA0B,CAG/C,0BASC,CARC,EAAG,CACD,iBAAiB,CAAE,YAAY,CACvB,SAAS,CAAE,YAAY,CAEjC,IAAK,CACH,iBAAiB,CAAE,cAAc,CACzB,SAAS,CAAE,cAAc,EAIrC,kBASC,CARC,EAAG,CACD,iBAAiB,CAAE,YAAY,CACvB,SAAS,CAAE,YAAY,CAEjC,IAAK,CACH,iBAAiB,CAAE,cAAc,CACzB,SAAS,CAAE,cA
 Ac,ECvBrC,aAA8B,CCU5B,MAAM,CAAE,wDAAmE,CAC3E,iBAAiB,CAAE,aAAgB,CAC/B,aAAa,CAAE,aAAgB,CAC3B,SAAS,CAAE,aAAgB,CDZrC,cAA8B,CCS5B,MAAM,CAAE,wDAAmE,CAC3E,iBAAiB,CAAE,cAAgB,CAC/B,aAAa,CAAE,cAAgB,CAC3B,SAAS,CAAE,cAAgB,CDXrC,cAA8B,CCQ5B,MAAM,CAAE,wDAAmE,CAC3E,iBAAiB,CAAE,cAAgB,CAC/B,aAAa,CAAE,cAAgB,CAC3B,SAAS,CAAE,cAAgB,CDTrC,mBAAmC,CCajC,MAAM,CAAE,wDAAmE,CAC3E,iBAAiB,CAAE,YAAoB,CACnC,aAAa,CAAE,YAAoB,CAC/B,SAAS,CAAE,YAAoB,CDfzC,iBAAmC,CCYjC,MAAM,CAAE,wDAAmE,CAC3E,iBAAiB,CAAE,YAAoB,CACnC,aAAa,CAAE,YAAoB,CAC/B,SAAS,CAAE,YAAoB,CDVzC,+GAIuC,CACrC,MAAM,CAAE,IAAI,CEfd,SAAyB,CACvB,QAAQ,CAAE,QAAQ,CAClB,OAAO,CAAE,YAAY,CACrB,KAAK,CAAE,GAAG,CACV,MAAM,CAAE,GAAG,CACX,WAAW,CAAE,GAAG,CAChB,cAAc,CAAE,MAAM,CAExB,yBAAyD,CACvD,QAAQ,CAAE,QAAQ,CAClB,IAAI,CAAE,CAAC,CACP,KAAK,CAAE,IAAI,CACX,UAAU,CAAE,MAAM,CAEpB,YAA4B,CAAE,WAAW,CAAE,OAAO,CAClD,YAA4B,CAAE,SAAS,CAAE,GAAG,CAC5C,WAA2B,CAAE,KAAK,CLXZ,IAAI,CML1B,gBAAgC,CAAE,OAAO,CNwP1B,GAAO,CMvPtB,gBAAgC,CAAE,OAAO,CNkV1B,GAAO,CMjVtB,qCAAiC,CAAE,OAAO,CNyZ1B,GAAO,CMxZvB,qB
 AAqC,CAAE,OAAO,CN2K1B,GAAO,CM1K3B,gBAAgC,CAAE,OAAO,CNqQ1B,GAAO,CMpQtB,eAA+B,CAAE,OAAO,CNkc1B,GAAO,CMjcrB,iBAAiC,CAAE,OAAO,CNsc1B,GAAO,CMrcvB,eAA+B,CAAE,OAAO,CN0gB1B,GAAO,CMzgBrB,eAA+B,CAAE,OAAO,CN+M1B,GAAO,CM9MrB,mBAAmC,CAAE,OAAO,CN8d1B,GAAO,CM7dzB,aAA6B,CAAE,OAAO,CN4d1B,GAAO,CM3dnB,kBAAkC,CAAE,OAAO,CN6d1B,GAAO,CM5dxB,gBAAgC,CAAE,OAAO,CN+F1B,GAAO,CM9FtB,mDAEgC,CAAE,OAAO,CNge1B,GAAO,CM/dtB,sBAAsC,CAAE,OAAO,CN6Y1B,GAAO,CM5Y5B,uBAAuC,CAAE,OAAO,CN2Y1B,GAAO,CM1Y7B,oBAAoC,CAAE,OAAO,CNqW1B,GAAO,CMpW1B,iBAAiC,CAAE,OAAO,CNwZ1B,GAAO,CMvZvB,8BAC8B,CAAE,OAAO,CNmH1B,GAAO,CMlHpB,kBAAkC,CAAE,OAAO,CNoe1B,GAAO,CMnexB,iCAA+B,CAAE,OAAO,CNqP1B,GAAO,CMpPrB,iBAAiC,CAAE,OAAO,CNmL1B,GAAO,CMlLvB,kBAAkC,CAAE,OAAO,CNqG1B,GAAO,CMpGxB,eAA+B,CAAE,OAAO,CNqX1B,GAAO,CMpXrB,uHAAmC,CAAE,OAAO,CNyI1B,GAAO,CMxIzB,8BAA8C,CAAE,OAAO,CNG1B,GAAO,CMFpC,4BAA4C,CAAE,OAAO,CNK1B,GAAO,CMJlC,gBAAgC,CAAE,OAAO,CNmP1B,GAAO,CMlPtB,wBAAwC,CAAE,OAAO,CNkV1B,GAAO,CMjV9B,yCACiC,CAAE,OAAO,CNyW1B,GAAO,CMxWvB,kBAAkC,CAAE,OAAO,CNoW1B,GAAO,CMnWx
 B,mBAAmC,CAAE,OAAO,CNiR1B,GAAO,CMhRzB,eAA+B,CAAE,OAAO,CNoR1B,GAAO,CMnRrB,eAA+B,CAAE,OAAO,CNsL1B,GAAO,CMrLrB,qBAAqC,CAAE,OAAO,CNkO1B,GAAO,CMjO3B,qBAAqC,CAAE,OAAO,CNkf1B,GAAO,CMjf3B,sBAAsC,CAAE,OAAO,CNgf1B,GAAO,CM/e5B,oBAAoC,CAAE,OAAO,CNif1B,GAAO,CMhf1B,iBAAiC,CAAE,OAAO,CNiV1B,GAAO,CMhVvB,kBAAkC,CAAE,OAAO,CNU1B,GAAO,CMTxB,cAA8B,CAAE,OAAO,CNkb1B,GAAO,CMjbpB,eAA+B,CAAE,OAAO,CNkb1B,GAAO,CMjbrB,iCAA+B,CAAE,OAAO,CNyB1B,GAAO,CMxBrB,mBAAmC,CAAE,OAAO,CNyB1B,GAAO,CMxBzB,gBAAgC,CAAE,OAAO,CNwU1B,GAAO,CMvUtB,iBAAiC,CAAE,OAAO,CNqC1B,GAAO,CMpCvB,eAA+B,CAAE,OAAO,CNoL1B,GAAO,CMnLrB,eAA+B,CAAE,OAAO,CNiB1B,GAAO,CMhBrB,iBAAiC,CAAE,OAAO,CNqO1B,GAAO,CMpOvB,sBAAsC,CAAE,OAAO,CN+a1B,GAAO,CM9a5B,qBAAqC,CAAE,OAAO,CN+a1B,GAAO,CM9a3B,qBAAqC,CAAE,OAAO,CN3C1B,GAAO,CM4C3B,uBAAuC,CAAE,OAAO,CN9C1B,GAAO,CM+C7B,sBAAsC,CAAE,OAAO,CN5C1B,GAAO,CM6C5B,wBAAwC,CAAE,OAAO,CN/C1B,GAAO,CMgD9B,eAA+B,CAAE,OAAO,CNwP1B,GAAO,CMvPrB,oCACkC,CAAE,OAAO,CN0R1B,GAAO,CMzRxB,iBAAiC,CAAE,OAAO,CNoN1B,GAAO,CMnNvB,uBAAuC,CAAE,OAAO,CNqd1B,GAAO,CMp
 d7B,sDAEoC,CAAE,OAAO,CNsS1B,GAAO,CMrS1B,iBAAiC,CAAE,OAAO,CN+R1B,GAAO,CM9RvB,qBAAqC,CAAE,OAAO,CN+P1B,GAAO,CM9P3B,iBAAiC,CAAE,OAAO,CN7D1B,GAAO,CM8DvB,eAA+B,CAAE,OAAO,CN4a1B,GAAO,CM3arB,0CAC0C,CAAE,OAAO,CN4R1B,GAAO,CM3RhC,yBAAyC,CAAE,OAAO,CN2V1B,GAAO,CM1V/B,yBAAyC,CAAE,OAAO,CNqC1B,GAAO,CMpC/B,iBAAiC,CAAE,OAAO,CNlC1B,GAAO,CMmCvB,wBAAwC,CAAE,OAAO,CNmY1B,GAAO,CMlY9B,wBAAwC,CAAE,OAAO,CNkH1B,GAAO,CMjH9B,mBAAmC,CAAE,OAAO,CN9B1B,GAAO,CM+BzB,eAA+B,CAAE,OAAO,CNgS1B,GAAO,CM/RrB,gBAAgC,CAAE,OAAO,CN+Q1B,GAAO,CM9QtB,eAA+B,CAAE,OAAO,CNiY1B,GAAO,CMhYrB,kBAAkC,CAAE,OAAO,CNqJ1B,GAAO,CMpJxB,uBAAuC,CAAE,OAAO,CN6G1B,GAAO,CM5G7B,uBAAuC,CAAE,OAAO,CN4X1B,GAAO,CM3X7B,gBAAgC,CAAE,OAAO,CNoF1B,GAAO,CMnFtB,uBAAuC,CAAE,OAAO,CN+B1B,GAAO,CM9B7B,wBAAwC,CAAE,OAAO,CN+B1B,GAAO,CM9B9B,sBAAsC,CAAE,OAAO,CN4R1B,GAAO,CM3R5B,uBAAuC,CAAE,OAAO,CNkP1B,GAAO,CMjP7B,8FAAuC,CAAE,OAAO,CNsZ1B,GAAO,CMrZ7B,+FAAuC,CAAE,OAAO,CNiB1B,GAAO,CMhB7B,0BAA0C,CAAE,OAAO,CNiS1B,GAAO,CMhShC,sBAAsC,CAAE,OAAO,CNuL1B,GAAO,CMtL5B,qBAAqC,CAAE,OAAO,CNuD1B,
 GAAO,CMtD3B,yBAAyC,CAAE,OAAO,CNkZ1B,GAAO,CMjZ/B,yBAAyC,CAAE,OAAO,CNa1B,GAAO,CMZ/B,cAA8B,CAAE,OAAO,CNhD1B,GAAO,CMiDpB,qBAAqC,CAAE,OAAO,CN5D1B,GAAO,CM6D3B,sBAAsC,CAAE,OAAO,CN5D1B,GAAO,CM6D5B,mBAAmC,CAAE,OAAO,CN5D1B,GAAO,CM6DzB,qBAAqC,CAAE,OAAO,CNhE1B,GAAO,CMiE3B,wCACgC,CAAE,OAAO,CNyT1B,GAAO,CMxTtB,iBAAiC,CAAE,OAAO,CN+E1B,GAAO,CM9EvB,mBAAmC,CAAE,OAAO,CNuC1B,GAAO,CMtCzB,eAA+B,CAAE,OAAO,CNyQ1B,GAAO,CMxQrB,gBAAgC,CAAE,OAAO,CN+N1B,GAAO,CM9NtB,mBAAmC,CAAE,OAAO,CN/D1B,GAAO,CMgEzB,gNAA6C,CAAE,OAAO,CNwE1B,GAAO,CMvEnC,eAA+B,CAAE,OAAO,CNmI1B,GAAO,CMlIrB,eAA+B,CAAE,OAAO,CNqL1B,GAAO,CMpLrB,iCAA+B,CAAE,OAAO,CNyG1B,GAAO,CMxGrB,cAA8B,CAAE,OAAO,CNyE1B,GAAO,CMxEpB,oBAAoC,CAAE,OAAO,CNyE1B,GAAO,CMxE1B,kDAC+C,CAAE,OAAO,CNkE1B,GAAO,CMjErC,gBAAgC,CAAE,OAAO,CNyP1B,GAAO,CMxPtB,mBAAmC,CAAE,OAAO,CNlC1B,GAAO,CMmCzB,iBAAiC,CAAE,OAAO,CN0Q1B,GAAO,CMzQvB,kBAAkC,CAAE,OAAO,CNmB1B,GAAO,CMlBxB,iBAAiC,CAAE,OAAO,CNqM1B,GAAO,CMpMvB,qBAAqC,CAAE,OAAO,CNH1B,GAAO,CMI3B,uBAAuC,CAAE,OAAO,CNP1B,GAAO,CMQ7B,kBAAkC,CAAE,OAAO,CNiR1B,
 GAAO,CMhRxB,wBAAwC,CAAE,OAAO,CN2S1B,GAAO,CM1S9B,iBAAiC,CAAE,OAAO,CNoG1B,GAAO,CMnGvB,sBAAsC,CAAE,OAAO,CNqG1B,GAAO,CMpG5B,mBAAmC,CAAE,OAAO,CNpF1B,GAAO,CMqFzB,mBAAmC,CAAE,OAAO,CNtF1B,GAAO,CMuFzB,2CACoC,CAAE,OAAO,CNhF1B,GAAO,CMiF1B,yBAAyC,CAAE,OAAO,CNkY1B,GAAO,CMjY/B,0BAA0C,CAAE,OAAO,CNyD1B,GAAO,CMxDhC,uBAAuC,CAAE,OAAO,CN/C1B,GAAO,CMgD7B,cAA8B,CAAE,OAAO,CNsJ1B,GAAO,CMrJpB,gCAC+B,CAAE,OAAO,CNA1B,GAAO,CMCrB,mBAAmC,CAAE,OAAO,CNG1B,GAAO,CMFzB,sBAAsC,CAAE,OAAO,CNiW1B,GAAO,CMhW5B,wBAAwC,CAAE,OAAO,CN+V1B,GAAO,CM9V9B,oBAAoC,CAAE,OAAO,CN2T1B,GAAO,CM1T1B,kBAAkC,CAAE,OAAO,CN4H1B,GAAO,CM3HxB,mBAAmC,CAAE,OAAO,CN2R1B,GAAO,CM1RzB,0BAA0C,CAAE,OAAO,CNiK1B,GAAO,CMhKhC,qBAAqC,CAAE,OAAO,CNwV1B,GAAO,CMvV3B,wBAAwC,CAAE,OAAO,CNsC1B,GAAO,CMrC9B,kBAAkC,CAAE,OAAO,CNsR1B,GAAO,CMrRxB,iBAAiC,CAAE,OAAO,CNyW1B,GAAO,CMxWvB,wBAAwC,CAAE,OAAO,CNiG1B,GAAO,CMhG9B,iBAAiC,CAAE,OAAO,CNyX1B,GAAO,CMxXvB,kBAAkC,CAAE,OAAO,CN+I1B,GAAO,CM9IxB,gBAAgC,CAAE,OAAO,CN6M1B,GAAO,CM5MtB,mBAAmC,CAAE,OAAO,CN2S1B,GAAO,CM1SzB,qBAAqC,CAAE,OAAO,C
 NjF1B,GAAO,CMkF3B,uBAAuC,CAAE,OAAO,CN2M1B,GAAO,CM1M7B,kBAAkC,CAAE,OAAO,CNyW1B,GAAO,CMxWxB,mBAAmC,CAAE,OAAO,CNgC1B,GAAO,CM/BzB,qCAAiC,CAAE,OAAO,CNsF1B,GAAO,CMrFvB,iBAAiC,CAAE,OAAO,CN6W1B,GAAO,CM5WvB,sBAAsC,CAAE,OAAO,CNb1B,GAAO,CMc5B,cAA8B,CAAE,OAAO,CNmP1B,GAAO,CMlPpB,gBAAgC,CAAE,OAAO,CNoG1B,GAAO,CMnGtB,mBAAmC,CAAE,OAAO,CNpF1B,GAAO,CMqFzB,eAA+B,CAAE,OAAO,CN1G1B,GAAO,CM2GrB,sBAAsC,CAAE,OAAO,CN7D1B,GAAO,CM8D5B,uBAAuC,CAAE,OAAO,CN8F1B,GAAO,CM7F7B,sBAAsC,CAAE,OAAO,CN4F1B,GAAO,CM3F5B,oBAAoC,CAAE,OAAO,CN6F1B,GAAO,CM5F1B,sBAAsC,CAAE,OAAO,CNyF1B,GAAO,CMxF5B,2DAA4C,CAAE,OAAO,CN5I1B,GAAO,CM6IlC,6DAA6C,CAAE,OAAO,CNxI1B,GAAO,CMyInC,0BAA0C,CAAE,OAAO,CNxI1B,GAAO,CMyIhC,4BAA4C,CAAE,OAAO,CNhJ1B,GAAO,CMiJlC,gBAAgC,CAAE,OAAO,CN2E1B,GAAO,CM1EtB,iBAAiC,CAAE,OAAO,CNqX1B,GAAO,CMpXvB,gBAAgC,CAAE,OAAO,CNgT1B,GAAO,CM/StB,iBAAiC,CAAE,OAAO,CNuC1B,GAAO,CMtCvB,oBAAoC,CAAE,OAAO,CNxG1B,GAAO,CMyG1B,qBAAqC,CAAE,OAAO,CNzI1B,GAAO,CM0I3B,iCACgC,CAAE,OAAO,CN8V1B,GAAO,CM7VtB,kDAC+B,CAAE,OAAO,CNwH1B,GAAO,CMvHrB,gBAAgC,CAAE
 ,OAAO,CNxD1B,GAAO,CMyDtB,gBAAgC,CAAE,OAAO,CNsC1B,GAAO,CMrCtB,kCACmC,CAAE,OAAO,CN+N1B,GAAO,CM9NzB,kCACkC,CAAE,OAAO,CNyB1B,GAAO,CMxBxB,oBAAoC,CAAE,OAAO,CN8J1B,GAAO,CM7J1B,mCACmC,CAAE,OAAO,CNiC1B,GAAO,CMhCzB,iBAAiC,CAAE,OAAO,CNkQ1B,GAAO,CMjQvB,qDAE+B,CAAE,OAAO,CN9I1B,GAAO,CM+IrB,kBAAkC,CAAE,OAAO,CNiH1B,GAAO,CMhHxB,kBAAkC,CAAE,OAAO,CN+G1B,GAAO,CM9GxB,wBAAwC,CAAE,OAAO,CN4Q1B,GAAO,CM3Q9B,oBAAoC,CAAE,OAAO,CNgU1B,GAAO,CM/T1B,gBAAgC,CAAE,OAAO,CNkR1B,GAAO,CMjRtB,gBAAgC,CAAE,OAAO,CNmH1B,GAAO,CMlHtB,gBAAgC,CAAE,OAAO,CNmT1B,GAAO,CMlTtB,oBAAoC,CAAE,OAAO,CNgK1B,GAAO,CM/J1B,2BAA2C,CAAE,OAAO,CNgK1B,GAAO,CM/JjC,6BAA6C,CAAE,OAAO,CN8C1B,GAAO,CM7CnC,sBAAsC,CAAE,OAAO,CN4C1B,GAAO,CM3C5B,gBAAgC,CAAE,OAAO,CNgI1B,GAAO,CM/HtB,wEAAqC,CAAE,OAAO,CNxH1B,GAAO,CMyH3B,mBAAmC,CAAE,OAAO,CNlH1B,GAAO,CMmHzB,qBAAqC,CAAE,OAAO,CNzH1B,GAAO,CM0H3B,sBAAsC,CAAE,OAAO,CNzH1B,GAAO,CM0H5B,kBAAkC,CAAE,OAAO,CN3E1B,GAAO,CM4ExB,mCAC+B,CAAE,OAAO,CN4N1B,GAAO,CM3NrB,yCACoC,CAAE,OAAO,CNgO1B,GAAO,CM/N1B,sCACmC,CAAE,OAAO,CN6N1B,GAAO,CM5NzB,
 mBAAmC,CAAE,OAAO,CN/C1B,GAAO,CMgDzB,mBAAmC,CAAE,OAAO,CNmF1B,GAAO,CMlFzB,sCAC+B,CAAE,OAAO,CN0S1B,GAAO,CMzSrB,iCACgC,CAAE,OAAO,CNW1B,GAAO,CMVtB,0CACqC,CAAE,OAAO,CN0P1B,GAAO,CMzP3B,oBAAoC,CAAE,OAAO,CNxF1B,GAAO,CMyF1B,qBAAqC,CAAE,OAAO,CNvF1B,GAAO,CMwF3B,gCAC+B,CAAE,OAAO,CNlK1B,GAAO,CMmKrB,kBAAkC,CAAE,OAAO,CNoM1B,GAAO,CMnMxB,mBAAmC,CAAE,OAAO,CN8R1B,GAAO,CM7RzB,qCACoC,CAAE,OAAO,CN9G1B,GAAO,CM+G1B,sBAAsC,CAAE,OAAO,CNiE1B,GAAO,CMhE5B,mBAAmC,CAAE,OAAO,CN1D1B,GAAO,CM2DzB,yBAAyC,CAAE,OAAO,CN7G1B,GAAO,CM8G/B,uBAAuC,CAAE,OAAO,CN7G1B,GAAO,CM8G7B,kBAAkC,CAAE,OAAO,CNkS1B,GAAO,CMjSxB,sBAAsC,CAAE,OAAO,CNgO1B,GAAO,CM/N5B,mBAAmC,CAAE,OAAO,CNqO1B,GAAO,CMpOzB,iBAAiC,CAAE,OAAO,CNxL1B,GAAO,CMyLvB,iBAAiC,CAAE,OAAO,CN7G1B,GAAO,CM8GvB,kBAAkC,CAAE,OAAO,CN3F1B,GAAO,CM4FxB,sBAAsC,CAAE,OAAO,CNpC1B,GAAO,CMqC5B,qBAAqC,CAAE,OAAO,CNzK1B,GAAO,CM0K3B,qBAAqC,CAAE,OAAO,CNqB1B,GAAO,CMpB3B,oBAAoC,CAAE,OAAO,CN3O1B,GAAO,CM4O1B,iBAAiC,CAAE,OAAO,CN4E1B,GAAO,CM3EvB,sBAAsC,CAAE,OAAO,CNxD1B,GAAO,CMyD5B,eAA+B,CAAE,OAAO,CNrM1B,GAAO
 ,CMsMrB,mBAAmC,CAAE,OAAO,CNG1B,GAAO,CMFzB,sBAAsC,CAAE,OAAO,CNuH1B,GAAO,CMtH5B,4BAA4C,CAAE,OAAO,CN5O1B,GAAO,CM6OlC,6BAA6C,CAAE,OAAO,CN5O1B,GAAO,CM6OnC,0BAA0C,CAAE,OAAO,CN5O1B,GAAO,CM6OhC,4BAA4C,CAAE,OAAO,CNhP1B,GAAO,CMiPlC,qBAAqC,CAAE,OAAO,CN5O1B,GAAO,CM6O3B,sBAAsC,CAAE,OAAO,CN5O1B,GAAO,CM6O5B,mBAAmC,CAAE,OAAO,CN5O1B,GAAO,CM6OzB,qBAAqC,CAAE,OAAO,CNhP1B,GAAO,CMiP3B,kBAAkC,CAAE,OAAO,CNxG1B,GAAO,CMyGxB,iBAAiC,CAAE,OAAO,CNyB1B,GAAO,CMxBvB,iBAAiC,CAAE,OAAO,CNmN1B,GAAO,CMlNvB,yCACiC,CAAE,OAAO,CNmE1B,GAAO,CMlEvB,mBAAmC,CAAE,OAAO,CNlJ1B,GAAO,CMmJzB,qBAAqC,CAAE,OAAO,CNiH1B,GAAO,CMhH3B,sBAAsC,CAAE,OAAO,CNiH1B,GAAO,CMhH5B,kBAAkC,CAAE,OAAO,CNiL1B,GAAO,CMhLxB,iBAAiC,CAAE,OAAO,CNvJ1B,GAAO,CMwJvB,sCACgC,CAAE,OAAO,CNyH1B,GAAO,CMxHtB,qBAAqC,CAAE,OAAO,CN9B1B,GAAO,CM+B3B,mBAAmC,CAAE,OAAO,CNjD1B,GAAO,CMkDzB,wBAAwC,CAAE,OAAO,CNhD1B,GAAO,CMiD9B,kBAAkC,CAAE,OAAO,CN2J1B,GAAO,CM1JxB,kBAAkC,CAAE,OAAO,CN9C1B,GAAO,CM+CxB,gBAAgC,CAAE,OAAO,CN+C1B,GAAO,CM9CtB,kBAAkC,CAAE,OAAO,CN9C1B,GAAO,CM+CxB,qBAAqC,CAAE,OAAO,CN
 I1B,GAAO,CMH3B,iBAAiC,CAAE,OAAO,CN9D1B,GAAO,CM+DvB,yBAAyC,CAAE,OAAO,CNhE1B,GAAO,CMiE/B,mBAAmC,CAAE,OAAO,CNsM1B,GAAO,CMrMzB,eAA+B,CAAE,OAAO,CN1J1B,GAAO,CM2JrB,8CACoC,CAAE,OAAO,CN4G1B,GAAO,CM3G1B,2EAEsC,CAAE,OAAO,CNwK1B,GAAO,CMvK5B,yBAAyC,CAAE,OAAO,CNmB1B,GAAO,CMlB/B,eAA+B,CAAE,OAAO,CNjJ1B,GAAO,CMkJrB,oBAAoC,CAAE,OAAO,CNjK1B,GAAO,CMkK1B,yCACuC,CAAE,OAAO,CN9L1B,GAAO,CM+L7B,mBAAmC,CAAE,OAAO,CNmF1B,GAAO,CMlFzB,eAA+B,CAAE,OAAO,CNvB1B,GAAO,CMwBrB,sBAAsC,CAAE,OAAO,CNvH1B,GAAO,CMwH5B,sBAAsC,CAAE,OAAO,CN6K1B,GAAO,CM5K5B,oBAAoC,CAAE,OAAO,CNyK1B,GAAO,CMxK1B,iBAAiC,CAAE,OAAO,CN9H1B,GAAO,CM+HvB,uBAAuC,CAAE,OAAO,CN0E1B,GAAO,CMzE7B,qBAAqC,CAAE,OAAO,CNwB1B,GAAO,CMvB3B,2BAA2C,CAAE,OAAO,CNwB1B,GAAO,CMvBjC,iBAAiC,CAAE,OAAO,CNqH1B,GAAO,CMpHvB,qBAAqC,CAAE,OAAO,CN9N1B,GAAO,CM+N3B,4BAA4C,CAAE,OAAO,CN1F1B,GAAO,CM2FlC,iBAAiC,CAAE,OAAO,CN2F1B,GAAO,CM1FvB,iBAAiC,CAAE,OAAO,CNc1B,GAAO,CMbvB,8BAA8C,CAAE,OAAO,CNtM1B,GAAO,CMuMpC,+BAA+C,CAAE,OAAO,CNtM1B,GAAO,CMuMrC,4BAA4C,CAAE,OAAO,CNtM1B,GAAO,CMuMlC,8BAA8C,CAAE,OAA
 O,CN1M1B,GAAO,CM2MpC,gBAAgC,CAAE,OAAO,CN7C1B,GAAO,CM8CtB,eAA+B,CAAE,OAAO,CNtK1B,GAAO,CMuKrB,iBAAiC,CAAE,OAAO,CN9S1B,GAAO,CM+SvB,qBAAqC,CAAE,OAAO,CN+M1B,GAAO,CM9M3B,mBAAmC,CAAE,OAAO,CN/O1B,GAAO,CMgPzB,qBAAqC,CAAE,OAAO,CNtJ1B,GAAO,CMuJ3B,qBAAqC,CAAE,OAAO,CNtJ1B,GAAO,CMuJ3B,qBAAqC,CAAE,OAAO,CNmF1B,GAAO,CMlF3B,sBAAsC,CAAE,OAAO,CN6C1B,GAAO,CM5C5B,iBAAiC,CAAE,OAAO,CN0K1B,GAAO,CMzKvB,uBAAuC,CAAE,OAAO,CNO1B,GAAO,CMN7B,wIAAyC,CAAE,OAAO,CNO1B,GAAO,CMN/B,mBAAmC,CAAE,OAAO,CN/B1B,GAAO,CMgCzB,qBAAqC,CAAE,OAAO,CNjC1B,GAAO,CMkC3B,uBAAuC,CAAE,OAAO,CN3N1B,GAAO,CM4N7B,wBAAwC,CAAE,OAAO,CNyB1B,GAAO,CMxB9B,+BAA+C,CAAE,OAAO,CNlJ1B,GAAO,CMmJrC,uBAAuC,CAAE,OAAO,CNuF1B,GAAO,CMtF7B,kBAAkC,CAAE,OAAO,CN9L1B,GAAO,CM+LxB,qDAC8C,CAAE,OAAO,CNnP1B,GAAO,CMoPpC,iDAC4C,CAAE,OAAO,CNlP1B,GAAO,CMmPlC,uDAC+C,CAAE,OAAO,CNrP1B,GAAO,CMsPrC,8BAC8B,CAAE,OAAO,CNpK1B,GAAO,CMqKpB,cAA8B,CAAE,OAAO,CNzG1B,GAAO,CM0GpB,gCAC8B,CAAE,OAAO,CNwL1B,GAAO,CMvLpB,+BAC8B,CAAE,OAAO,CNrE1B,GAAO,CMsEpB,2DAG8B,CAAE,OAAO,CNnE1B,GAAO,CMoEpB,iDAE8B,CAA
 E,OAAO,CNqD1B,GAAO,CMpDpB,6BAC8B,CAAE,OAAO,CNpE1B,GAAO,CMqEpB,iCAC8B,CAAE,OAAO,CN1R1B,GAAO,CM2RpB,eAA+B,CAAE,OAAO,CNlK1B,GAAO,CMmKrB,oBAAoC,CAAE,OAAO,CNtJ1B,GAAO,CMuJ1B,yBAAyC,CAAE,OAAO,CN4E1B,GAAO,CM3E/B,0BAA0C,CAAE,OAAO,CN4E1B,GAAO,CM3EhC,0BAA0C,CAAE,OAAO,CN4E1B,GAAO,CM3EhC,2BAA2C,CAAE,OAAO,CN4E1B,GAAO,CM3EjC,2BAA2C,CAAE,OAAO,CN+E1B,GAAO,CM9EjC,4BAA4C,CAAE,OAAO,CN+E1B,GAAO,CM9ElC,oBAAoC,CAAE,OAAO,CN+H1B,GAAO,CM9H1B,sBAAsC,CAAE,OAAO,CN2H1B,GAAO,CM1H5B,yBAAyC,CAAE,OAAO,CN4L1B,GAAO,CM3L/B,kBAAkC,CAAE,OAAO,CNyL1B,GAAO,CMxLxB,eAA+B,CAAE,OAAO,CNmL1B,GAAO,CMlLrB,sBAAsC,CAAE,OAAO,CNmL1B,GAAO,CMlL5B,uBAAuC,CAAE,OAAO,CNuL1B,GAAO,CMtL7B,kBAAkC,CAAE,OAAO,CN/M1B,GAAO,CMgNxB,yBAAyC,CAAE,OAAO,CNgF1B,GAAO,CM/E/B,oBAAoC,CAAE,OAAO,CNjG1B,GAAO,CMkG1B,iBAAiC,CAAE,OAAO,CNxJ1B,GAAO,CMyJvB,cAA8B,CAAE,OAAO,CNhX1B,GAAO,CMiXpB,2CAAoC,CAAE,OAAO,CNzT1B,GAAO,CM0T1B,2BAA2C,CAAE,OAAO,CNzT1B,GAAO,CM0TjC,iBAAiC,CAAE,OAAO,CNqI1B,GAAO,CMpIvB,wBAAwC,CAAE,OAAO,CNqI1B,GAAO,CMpI9B,0BAA0C,CAAE,OAAO,CNrE1B,GAAO,CMsEhC,wB
 AAwC,CAAE,OAAO,CNnE1B,GAAO,CMoE9B,0BAA0C,CAAE,OAAO,CNtE1B,GAAO,CMuEhC,2BAA2C,CAAE,OAAO,CNtE1B,GAAO,CMuEjC,gBAAgC,CAAE,OAAO,CNxW1B,GAAO,CMyWtB,kBAAkC,CAAE,OAAO,CN8J1B,GAAO,CM7JxB,kBAAkC,CAAE,OAAO,CNpX1B,GAAO,CMqXxB,gBAAgC,CAAE,OAAO,CNnF1B,GAAO,CMoFtB,mBAAmC,CAAE,OAAO,CNjO1B,GAAO,CMkOzB,gBAAgC,CAAE,OAAO,CNsC1B,GAAO,CMrCtB,qBAAqC,CAAE,OAAO,CNhK1B,GAAO,CMiK3B,iBAAiC,CAAE,OAAO,CNmH1B,GAAO,CMlHvB,iBAAiC,CAAE,OAAO,CNxM1B,GAAO,CMyMvB,eAA+B,CAAE,OAAO,CNzE1B,GAAO,CM0ErB,iBAAiC,CAAE,OAAO,CNrJ1B,GAAO,CMsJvB,gBAAgC,CAAE,OAAO,CN2E1B,GAAO,CM1EtB,iBAAiC,CAAE,OAAO,CN7D1B,GAAO,CM8DvB,kBAAkC,CAAE,OAAO,CNpX1B,GAAO,CMqXxB,cAA8B,CAAE,OAAO,CNpU1B,GAAO,CMqUpB,aAA6B,CAAE,OAAO,CNsI1B,GAAO,CMrInB,gBAAgC,CAAE,OAAO,CN2I1B,GAAO,CM1ItB,iBAAiC,CAAE,OAAO,CNX1B,GAAO,CMYvB,oBAAoC,CAAE,OAAO,CN5D1B,GAAO,CM6D1B,yBAAyC,CAAE,OAAO,CNgD1B,GAAO,CM/C/B,+BAA+C,CAAE,OAAO,CNrX1B,GAAO,CMsXrC,8BAA8C,CAAE,OAAO,CNvX1B,GAAO,CMwXpC,qDAC8C,CAAE,OAAO,CN5T1B,GAAO,CM6TpC,uBAAuC,CAAE,OAAO,CNvP1B,GAAO,CMwP7B,qBAAqC,CAAE,OAAO,CNoI1B,GAAO,CMn
 I3B,uBAAuC,CAAE,OAAO,CNyH1B,GAAO,CMxH7B,sCAC8B,CAAE,OAAO,CNiG1B,GAAO,CMhGpB,wEAAwC,CAAE,OAAO,CNzC1B,GAAO,CM0C9B,wBAAwC,CAAE,OAAO,CN+B1B,GAAO,CM9B9B,gBAAgC,CAAE,OAAO,CNa1B,GAAO,CMZtB,0BAA0C,CAAE,OAAO,CNnP1B,GAAO,CMoPhC,oBAAoC,CAAE,OAAO,CNgI1B,GAAO,CM/H1B,iBAAiC,CAAE,OAAO,CN9E1B,GAAO,CM+EvB,4DAEqC,CAAE,OAAO,CNmG1B,GAAO,CMlG3B,iDACyC,CAAE,OAAO,CN3K1B,GAAO,CM4K/B,gBAAgC,CAAE,OAAO,CN6H1B,GAAO,CM5HtB,iBAAiC,CAAE,OAAO,CNjL1B,GAAO,CMkLvB,iBAAiC,CAAE,OAAO,CNxC1B,GAAO,CMyCvB,wBAAwC,CAAE,OAAO,CNxC1B,GAAO,CMyC9B,6BAA6C,CAAE,OAAO,CNuC1B,GAAO,CMtCnC,sBAAsC,CAAE,OAAO,CNqC1B,GAAO,CMpC5B,oBAAoC,CAAE,OAAO,CNlR1B,GAAO,CMmR1B,eAA+B,CAAE,OAAO,CNhR1B,GAAO,CMiRrB,qBAAqC,CAAE,OAAO,CNxE1B,GAAO,CMyE3B,yBAAyC,CAAE,OAAO,CNxE1B,GAAO,CMyE/B,iBAAiC,CAAE,OAAO,CN7Q1B,GAAO,CM8QvB,iBAAiC,CAAE,OAAO,CN3J1B,GAAO,CM4JvB,mBAAmC,CAAE,OAAO,CNtJ1B,GAAO,CMuJzB,cAA8B,CAAE,OAAO,CNtP1B,GAAO,CMuPpB,mBAAmC,CAAE,OAAO,CN3W1B,GAAO,CM4WzB,gBAAgC,CAAE,OAAO,CNjU1B,GAAO,CMkUtB,cAA8B,CAAE,OAAO,CN1F1B,GAAO,CM2FpB,gBAAgC,CAAE,OAAO,CNM1B,GAA
 O,CMLtB,eAA+B,CAAE,OAAO,CNrS1B,GAAO,CMsSrB,gBAAgC,CAAE,OAAO,CNrS1B,GAAO,CMsStB,kBAAkC,CAAE,OAAO,CNtY1B,GAAO,CMuYxB,yBAAyC,CAAE,OAAO,CNtY1B,GAAO,CMuY/B,gBAAgC,CAAE,OAAO,CNa1B,GAAO,CMZtB,uBAAuC,CAAE,OAAO,CNa1B,GAAO,CMZ7B,kBAAkC,CAAE,OAAO,CN/D1B,GAAO,CMgExB,oCAC8B,CAAE,OAAO,CN5W1B,GAAO,CM6WpB,8BAC+B,CAAE,OAAO,CN2B1B,GAAO,CM1BrB,eAA+B,CAAE,OAAO,CNoD1B,GAAO,CMnDrB,kBAAkC,CAAE,OAAO,CNN1B,GAAO,CMOxB,qBAAqC,CAAE,OAAO,CNzS1B,GAAO,CM0S3B,qBAAqC,CAAE,OAAO,CNZ1B,GAAO,CMa3B,mBAAmC,CAAE,OAAO,CN/S1B,GAAO,CMgTzB,qBAAqC,CAAE,OAAO,CNhQ1B,GAAO,CMiQ3B,sBAAsC,CAAE,OAAO,CNzP1B,GAAO,CM0P5B,uBAAuC,CAAE,OAAO,CNtQ1B,GAAO,CMuQ7B,4BAA4C,CAAE,OAAO,CNhQ1B,GAAO,CMiQlC,yEAEuC,CAAE,OAAO,CNzQ1B,GAAO,CM0Q7B,+CACyC,CAAE,OAAO,CN/Q1B,GAAO,CMgR/B,+CACuC,CAAE,OAAO,CNhR1B,GAAO,CMiR7B,+CACuC,CAAE,OAAO,CNrQ1B,GAAO,CMsQ7B,sBAAsC,CAAE,OAAO,CNlR1B,GAAO,CMmR5B,eAA+B,CAAE,OAAO,CN4D1B,GAAO,CM3DrB,kBAAkC,CAAE,OAAO,CNrV1B,GAAO,CMsVxB,mBAAmC,CAAE,OAAO,CNhM1B,GAAO,CMiMzB,uGAIoC,CAAE,OAAO,CNtL1B,GAAO,CMuL1B,yBAAyC,CAAE,OAAO,CNvW1B,GAAO
 ,CMwW/B,8BACgC,CAAE,OAAO,CNlG1B,GAAO,CMmGtB,+BACiC,CAAE,OAAO,CN1T1B,GAAO,CM2TvB,qBAAqC,CAAE,OAAO,CNpP1B,GAAO,CMqP3B,cAA8B,CAAE,OAAO,CNtP1B,GAAO,CMuPpB,sBAAsC,CAAE,OAAO,CNxO1B,GAAO,CMyO5B,wBAAwC,CAAE,OAAO,CNR1B,GAAO,CMS9B,aAA6B,CAAE,OAAO,CNjH1B,GAAO,CMkHnB,mCACiC,CAAE,OAAO,CNiD1B,GAAO,CMhDvB,sCACsC,CAAE,OAAO,CNrJ1B,GAAO,CMsJ5B,0CACwC,CAAE,OAAO,CNtJ1B,GAAO,CMuJ9B,kBAAkC,CAAE,OAAO,CNvO1B,GAAO,CMwOxB,sBAAsC,CAAE,OAAO,CNvX1B,GAAO,CMwX5B,iBAAiC,CAAE,OAAO,CN7O1B,GAAO,CM8OvB,oBAAoC,CAAE,OAAO,CNxJ1B,GAAO,CMyJ1B,kBAAkC,CAAE,OAAO,CNvE1B,GAAO,CMwExB,oBAAoC,CAAE,OAAO,CNtF1B,GAAO,CMuF1B,2BAA2C,CAAE,OAAO,CNtF1B,GAAO,CMuFjC,eAA+B,CAAE,OAAO,CNnb1B,GAAO,CMobrB,4CACmC,CAAE,OAAO,CNjR1B,GAAO,CMkRzB,cAA8B,CAAE,OAAO,CNI1B,GAAO,CMHpB,qBAAqC,CAAE,OAAO,CN9b1B,GAAO,CM+b3B,eAA+B,CAAE,OAAO,CN5I1B,GAAO,CM6IrB,qBAAqC,CAAE,OAAO,CN/E1B,GAAO,CMgF3B,iBAAiC,CAAE,OAAO,CNI1B,GAAO,CMHvB,eAA+B,CAAE,OAAO,CNuC1B,GAAO,CMtCrB,sBAAsC,CAAE,OAAO,CN7K1B,GAAO,CM8K5B,eAA+B,CAAE,OAAO,CN6B1B,GAAO,CM5BrB,qBAAqC,CAAE,OAAO,CNjb1B,GAAO,C
 Mkb3B,iBAAiC,CAAE,OAAO,CNpK1B,GAAO,CMqKvB,wBAAwC,CAAE,OAAO,CNzQ1B,GAAO,CM0Q9B,kBAAkC,CAAE,OAAO,CNha1B,GAAO,CMiaxB,wBAAwC,CAAE,OAAO,CNpa1B,GAAO,CMqa9B,sBAAsC,CAAE,OAAO,CNta1B,GAAO,CMua5B,kBAAkC,CAAE,OAAO,CNxa1B,GAAO,CMyaxB,oBAAoC,CAAE,OAAO,CNta1B,GAAO,CMua1B,oBAAoC,CAAE,OAAO,CNta1B,GAAO,CMua1B,qBAAqC,CAAE,OAAO,CNjd1B,GAAO,CMkd3B,uBAAuC,CAAE,OAAO,CNjd1B,GAAO,CMkd7B,gBAAgC,CAAE,OAAO,CNtB1B,GAAO,CMuBtB,oBAAoC,CAAE,OAAO,CN9X1B,GAAO,CM+X1B,aAA6B,CAAE,OAAO,CNne1B,GAAO,CMoenB,qBAAqC,CAAE,OAAO,CNtV1B,GAAO,CMuV3B,sBAAsC,CAAE,OAAO,CN1L1B,GAAO,CM2L5B,wBAAwC,CAAE,OAAO,CNpd1B,GAAO,CMqd9B,qBAAqC,CAAE,OAAO,CNzf1B,GAAO,CM0f3B,oBAAoC,CAAE,OAAO,CN7K1B,GAAO,CM8K1B,qBAAqC,CAAE,OAAO,CNzO1B,GAAO,CM0O3B,iBAAiC,CAAE,OAAO,CNtP1B,GAAO,CMuPvB,wBAAwC,CAAE,OAAO,CNtP1B,GAAO,CMuP9B,qBAAqC,CAAE,OAAO,CNrC1B,GAAO,CMsC3B,oBAAoC,CAAE,OAAO,CNrC1B,GAAO,CMsC1B,kBAAkC,CAAE,OAAO,CN9d1B,GAAO,CM+dxB,cAA8B,CAAE,OAAO,CN5c1B,GAAO,CM6cpB,kBAAkC,CAAE,OAAO,CNtQ1B,GAAO,CMuQxB,oBAAoC,CAAE,OAAO,CN9gB1B,GAAO,CM+gB1B,aAA6B,CAAE,OAAO,CN/
 b1B,GAAO,CMgcnB,kDAE8B,CAAE,OAAO,CNpR1B,GAAO,CMqRpB,mBAAmC,CAAE,OAAO,CN/N1B,GAAO,COtUzB,swBAAK,CACH,WAAW,CAAE,OAAO,CACpB,y5BAAQ,CACN,WAAW,CC+BuB,aAAa,CD9B/C,OAAO,CAAE,YAAY,CACrB,UAAU,CAAE,MAAM,CAClB,WAAW,CAAE,MAAM,CACnB,WAAW,CAAE,CAAC,CACd,eAAe,CAAE,OAAO,CAM5B,86BAAkB,CAChB,OAAO,CAAE,YAAY,CACrB,eAAe,CAAE,OAAO,CAGxB,muEAAgB,CACd,OAAO,CAAE,MAAM,CACf,2wEAAuB,CACrB,WAAW,CAAE,KAAI,CACnB,utEAAsB,CACpB,OAAO,CAAE,YAAY,CAE3B,2iBAA2B,CACzB,OAAO,CAAE,GAAE,CfpBL,kBAAoB,CAAE,qBAAM,CAK5B,eAAiB,CAAE,qBAAM,CAezB,UAAY,CAAE,qBAAM,CeE5B,+nBAAiC,CAC/B,OAAO,CAAE,CAAC,CAGV,mtCAAuB,CACrB,SAAS,CAAE,IAAI,CACf,cAAc,CAAE,IAAI,CEpBxB,0PAAS,CACP,OAAO,CAAE,IAAqB,CAC9B,WAAW,CDayB,IAAI,CCZxC,aAAa,CDYuB,IAAI,CCXxC,UAAU,CAAE,OAAmB,CAEjC,8CAAe,CACb,KAAK,CDkC+B,IAAM,CCjC1C,WAAW,CAAE,IAAI,CACjB,OAAO,CAAE,KAAK,CACd,KAAK,CD+B+B,IAAM,CC9B1C,UAAU,CAAE,OAAkB,CAC9B,MAAM,CAAE,KAAsB,CAC9B,OAAO,CAAE,QAA2C,CACpD,aAAa,CAAE,IAAqB,CAEtC,0ZAAyB,CACvB,UAAU,CAAE,OAAkB,CAC9B,mxCAAe,CACb,UAAU,CAAE,OAAiB,CACjC,kYAA0B,CACxB,UAAU,CAAE,OAAm
 B,CAC/B,ouCAAe,CACb,UAAU,CAAE,OAAoB,CAEpC,sYAAuB,CACrB,UAAU,CAAE,OAAmB,CAC/B,yuCAAe,CACb,UAAU,CAAE,OAAkB,CAElC,mZAA0B,CACxB,UAAU,CAAE,OAAuB,CACnC,swCAAe,CACb,UAAU,CAAE,OAAqB,CAErC,scAA0B,CACxB,UAAU,CDmB0B,OAAmB,CClBvD,42CAAe,CACb,KAAK,CCjD6B,OAAW,CDkD7C,UAAU,CDJwB,OAAmB,CCKvD,8dAAC,CACC,KAAK,CDsB6B,OAAW,CCpBjD,sZAAsB,CACpB,aAAa,CAAE,CAAC,CAsBlB,kBAAkB,CAChB,QAAQ,CAAE,KAAK,CACf,MAAM,CAAE,GAAG,CACX,IAAI,CAAE,CAAC,CACP,OAAO,CDG6B,GAAG,CCFvC,qBAAE,CACA,OAAO,CAAE,KAAK,CACd,KAAK,CDT6B,KAAK,CCUvC,UAAU,CAAE,WAAW,CACvB,KAAK,CDlC6B,IAAM,CCmCxC,UAAU,CAAE,MAAM,CAClB,UAAU,CAAE,2BAA0B,CACtC,OAAO,CAAE,MAAmB,CAC5B,SAAS,CAAE,GAAG,CACd,OAAO,CAAE,CAAC,CACV,MAAM,CAAE,CAAC,CACT,WAAW,CAAE,IAAI,CACjB,QAAQ,CAAE,MAAM,CjB3FZ,kBAAoB,CAAE,gBAAM,CAK5B,eAAiB,CAAE,gBAAM,CAezB,UAAY,CAAE,gBAAM,CiByExB,0CAAsB,CACpB,UAAU,CDhCsB,OAAM,CCiCxC,uCAAmB,CACjB,UAAU,CDzBsB,OAAW,CC0B7C,0CAAsB,CACpB,UAAU,CDnFsB,OAAO,CCoFzC,yCAAqB,CACnB,UAAU,CDtEsB,OAAI,CCuEtC,wBAAI,CACF,OAAO,CAAE,CAAC,CACV,MAAM,CAAE,IAAI,CEhFd,oCAAsB,CFmFxB,kBA
 AkB,CAChB,MAAM,CAAE,IAAI,CACZ,GAAG,CAAE,CAAC,CACN,KAAK,CAAE,IAAI,CACX,qBAAE,CACA,KAAK,CAAE,IAAI,EG3FjB,MAAM,CACJ,SAAS,CAAE,IAAI,CACf,MAAM,CAAE,CAAC,CACT,cAAc,CAAE,QAAQ,CACxB,eAAe,CAAE,MAAM,CACvB,MAAM,CAAE,OAAO,CACf,WAAW,CAAE,MAAM,CACnB,kBAAkB,CAAE,MAAM,CAC1B,SAAS,CAAE,OAAO,CACpB,gDAAiD,CAC/C,MAAM,CAAE,CAAC,CACT,OAAO,CAAE,CAAC,CACZ,gBAAgB,CACd,MAAM,CAAE,OAAO,CAEjB,IAAI,CAEF,OAAO,CAAE,YAAY,CACrB,aAAa,CAAE,GAAG,CAClB,WAAW,CAAE,MAAM,CACnB,WAAW,CAAE,MAAM,CACnB,UAAU,CAAE,MAAM,CAClB,MAAM,CAAE,OAAO,CACf,SAAS,CAAE,IAAI,CACf,OAAO,CAAE,iBAA6F,CACtG,KAAK,CJI+B,IAAM,CIH1C,MAAM,CAAE,yBAAyB,CACjC,gBAAgB,CJeoB,OAAM,CId1C,eAAe,CAAE,IAAI,CACrB,WAAW,CAAE,MAAM,CACnB,WAAW,CFnDyB,uDAAM,CEoD1C,UAAU,CAAE,mFAA8C,CAC1D,YAAY,CAAE,KAAK,CACnB,cAAc,CAAE,MAAM,CACtB,QAAQ,CAAE,MAAM,CAChB,IAAI,CAAE,CAAC,CACP,iBAAiB,CAAE,IAAI,CpBxDjB,mBAAoB,CoByDb,IAAI,CpBpDX,gBAAiB,CoBoDV,IAAI,CpB/CX,eAAgB,CoB+CT,IAAI,CpBrCX,WAAY,CoBqCL,IAAI,CpBzDX,kBAAoB,CAAE,eAAM,CAK5B,eAAiB,CAAE,eAAM,CAezB,UAAY,CAAE,eAAM,CoByC5B,UAAU,CACR,UAAU,CA
 AE,OAAwB,CACpC,KAAK,CJd+B,IAAM,CIiB1C,UAAO,CACL,UAAU,CAAE,OAAqC,CACjD,KAAK,CJnB6B,IAAM,CIoB1C,UAAO,CACL,UAAU,CAAE,OAAqC,CACjD,OAAO,CAAE,CAAC,CACZ,WAAQ,CACN,UAAU,CAAE,6EAAyC,CACrD,OAAO,CAAE,iBAA6F,CACxG,YAAS,CACP,KAAK,CJ3B6B,IAAM,CI4B1C,aAAU,CACR,gBAAgB,CAAE,IAAI,CACtB,MAAM,CAAE,2DAA2D,CACnE,MAAM,CAAE,iBAAmB,CAC3B,OAAO,CAAE,GAAG,CACZ,MAAM,CAAE,WAAW,CACnB,UAAU,CAAE,IAAI,CAEpB,aAAa,CACX,gBAAgB,CAAE,IAAI,CACtB,MAAM,CAAE,2DAA2D,CACnE,MAAM,CAAE,iBAAmB,CAC3B,OAAO,CAAE,GAAG,CACZ,MAAM,CAAE,WAAW,CACnB,UAAU,CAAE,IAAI,CAChB,4DAA0B,CACxB,gBAAgB,CAAE,IAAI,CACtB,MAAM,CAAE,2DAA2D,CACnE,MAAM,CAAE,iBAAmB,CAC3B,OAAO,CAAE,GAAI,CACb,MAAM,CAAE,WAAW,CACnB,UAAU,CAAE,IAAI,CAGpB,sBAAsB,CACpB,OAAO,CAAE,CAAC,CACV,MAAM,CAAE,CAAC,CAEX,UAAU,CACR,SAAS,CAAE,GAAG,CAEhB,SAAS,CACP,gBAAgB,CAAE,kBAAgB,CAClC,eAAO,CACL,gBAAgB,CAAE,kBAA6B,CAEnD,YAAY,CACV,gBAAgB,CAAE,kBAA2C,CAC7D,KAAK,CAAE,kBAAsB,CAC7B,kBAAO,CACL,gBAAgB,CAAE,kBAAuD,CACzE,KAAK,CFzH6B,OAAW,CE0H/C,oBAAS,CACP,KAAK,CAAE,kBAAsB,CAEjC,YAAY,CACV,gBAAgB,CAAE,kBAAiB,
 CACnC,kBAAO,CACL,gBAAgB,CAAE,eAA6B,CAEnD,WAAW,CACT,gBAAgB,CAAE,kBAAe,CACjC,iBAAO,CACL,gBAAgB,CAAE,kBAA4B,CAElD,YAAY,CACV,gBAAgB,CAAE,kBAAkB,CACpC,kBAAO,CACL,gBAAgB,CAAE,kBAA+B,CACrD,WAAW,CACT,gBAAgB,CJvIoB,IAAI,CIwIxC,iBAAO,CACL,gBAAgB,CAAE,kBAAoC,CAE1D,SAAS,CACP,gBAAgB,CAAE,sBAAsB,CACxC,KAAK,CJxE+B,OAAW,CIyE/C,UAAU,CAAE,IAAI,CAChB,YAAY,CAAE,sBAAsB,CACpC,eAAO,CACL,gBAAgB,CAAE,sBAAsB,CACxC,KAAK,CAAE,kBAAoC,CAC3C,UAAU,CAAE,IAAI,CAClB,gBAAQ,CACN,gBAAgB,CAAE,sBAAsB,CACxC,KAAK,CAAE,kBAAoC,CAC3C,UAAU,CAAE,IAAI,CAClB,iBAAS,CACP,KAAK,CJnG6B,OAAO,CIqG7C,mCAAoC,CAClC,cAAc,CAAE,MAAM,CAExB,aAAa,CACX,aAAa,CJ1IuB,IAAI,CduExC,KAAK,CAAE,CAAC,CACR,wCAAS,CAEP,OAAO,CAAE,KAAK,CACd,OAAO,CAAE,EAAE,CACb,mBAAO,CACL,KAAK,CAAE,IAAI,CmB3Ff,YAAY,CACV,QAAQ,CAAE,QAAQ,CAClB,OAAO,CAAE,YAAY,CAIvB,qCAAqC,CACnC,OAAO,CAAE,KAAK,CAChB,iBAAiB,CACf,QAAQ,CAAE,QAAQ,CAClB,IAAI,CAAE,CAAC,CACP,OAAO,CAAE,IAAI,CACb,KAAK,CAAE,IAAI,CACX,GAAG,CAAE,IAAI,CACT,SAAS,CAAE,IAAI,CACf,UAAU,CL1B0B,OAAyB,CK2B7D,OAAO,CLmD6B,GAAG,CKlDvC,MAAM,C
 AAE,iBAAgC,CACxC,UAAU,CAAE,2BAA0B,CACtC,OAAO,CAAE,IAAqB,CAC9B,sBAAQ,CACN,OAAO,CAAE,KAAK,CACd,KAAK,CAAE,IAAI,CACX,KAAK,CHnC6B,OAAW,CGoC7C,WAAW,CAAE,MAAM,CACnB,SAAS,CAAE,GAAG,CACd,OAAO,CAAE,MAAuB,CAChC,MAAM,CAAE,OAAO,CACf,4BAAO,CACL,UAAU,CLiCsB,OAAW,CKhC3C,KAAK,CLU2B,IAAM,CKT1C,4BAAY,CACV,UAAU,CAAE,iBAAgC,CAC5C,MAAM,CAAE,KAAuB,CACjC,2BAAW,CACT,cAAc,CAAE,IAAqB,CACrC,gDAAoB,CAClB,KAAK,CAAE,IAAI,CACf,mCAAmB,CACjB,UAAU,CAAE,OAA4B,CACxC,cAAc,CAAE,SAAS,CACzB,WAAW,CAAE,GAAG,CAChB,SAAS,CAAE,GAAG,CACd,yCAAO,CACL,UAAU,CAAE,OAA4B,CAC1C,wCAAI,CACF,KAAK,CLN2B,IAAM,CKQ5C,6CAA6C,CAC3C,MAAM,CAAE,IAAI,CACZ,GAAG,CAAE,IAAI,CACT,IAAI,CAAE,IAAI,CACV,KAAK,CAAE,CAAC,CAGR,iDAAiB,CACf,UAAU,CLnEwB,OAAyB,CKoE3D,UAAU,CAAE,GAAG,CACjB,mDAAmB,CACjB,OAAO,CAAE,QAA2C,CACpD,yDAAO,CACL,UAAU,CLCsB,OAAW,CKA3C,KAAK,CLtB2B,IAAM,CKwB5C,+CAA+C,CAC7C,KAAK,CAAE,CAAC,CACR,IAAI,CAAE,IAAI,CACV,UAAU,CAAE,KAAK,CAGjB,yBAAQ,CACN,OAAO,CAAE,GAAG,CACZ,aAAa,CAAE,iBAA0B,CACzC,WAAW,CAAE,qBAAqB,CAClC,YAAY,CAAE,qBAAqB,CACnC,QAAQ,CAAE,QAAQ,CAC
 lB,OAAO,CAAE,KAAK,CACd,GAAG,CAAE,IAAI,CACT,IAAI,CAAE,GAAG,CACT,WAAW,CAAE,IAAI,CACnB,gDAA+B,CAC7B,IAAI,CAAE,IAAI,CCtEZ,uBAAM,CACJ,OAAO,CAAE,KAAK,CAEhB,gIAA+C,CAC7C,OAAO,CAAE,YAAY,CACrB,QAAQ,CAAE,MAAM,CAChB,KAAK,CAAE,CAAC,CACR,cAAc,CAAE,MAAM,CAItB,wCAAO,CACL,OAAO,CAAE,YAAY,CACrB,cAAc,CAAE,MAAM,CACtB,KAAK,CAAE,IAAI,CACX,MAAM,CAAE,YAA+C,CACvD,KAAK,CAAE,IAAI,CACf,4BAAW,CACT,KAAK,CAAE,IAAI,CACX,kCAAK,CACH,OAAO,CAAE,KAAK,CAChB,mCAAM,CACJ,UAAU,CAAE,GAAqB,CAEvC,QAAQ,CACN,MAAM,CAAE,CAAC,CACT,MAAM,CAAE,CAAC,CACT,OAAO,CAAE,CAAC,CACZ,MAAM,CACJ,OAAO,CAAE,KAAK,CACd,KAAK,CAAE,IAAI,CACX,MAAM,CAAE,CAAC,CACT,OAAO,CAAE,CAAC,CACV,WAAW,CAAE,MAAM,CACnB,aAAa,CN/BuB,IAAI,CMgCxC,SAAS,CAAE,IAAI,CACf,YAAY,CAAE,IAAI,CACpB,KAAK,CACH,OAAO,CAAE,KAAK,CACd,MAAM,CAAE,cAAa,CACrB,KAAK,CNR+B,IAAU,CMS9C,SAAS,CAAE,GAAG,CAEhB,qBAAuB,CACrB,SAAS,CAAE,IAAI,CACf,MAAM,CAAE,CAAC,CACT,cAAc,CAAE,QAAQ,CACxB,eAAe,CAAE,MAAM,CAGzB,iBAAiB,CACf,aAAa,CNhDuB,IAAI,CduExC,KAAK,CAAE,CAAC,CqBrGR,SAAS,CCCC,IAAQ,CDChB,WAAI,CAAE,IAAI,CACV,YAAK,C
 AAE,IAAI,CrBkGb,KAAK,CAAE,CAAC,CACR,gDAAS,CAEP,OAAO,CAAE,KAAK,CACd,OAAO,CAAE,EAAE,CACb,uBAAO,CACL,KAAK,CAAE,IAAI,CALb,gDAAS,CAEP,OAAO,CAAE,KAAK,CACd,OAAO,CAAE,EAAE,CACb,uBAAO,CACL,KAAK,CAAE,IAAI,CoBzBf,uDAAyD,CACvD,OAAO,CAAE,IAAI,CACb,KAAK,CN/C+B,OAAI,CMoDxC,mGAA+C,CAC7C,cAAc,CAAE,IAAqB,CACrC,wHAAM,CACJ,KAAK,CAAE,IAAI,CAEX,0tEAAqP,CACnP,KAAK,CAAE,IAAI,CACnB,+BAA+B,CGlF3B,KAAK,CAAE,IAAsB,CAG3B,OAAO,CAAE,KAAK,CAed,YAAoB,CAAE,QAA+B,CACrD,KAAK,CAAE,IAAuC,CCnB5C,YAAoB,CAAE,CAAC,CDqBzB,0CAAa,CACX,YAAoB,CAAE,CAAC,CHgE/B,iCAAiC,CGtF7B,KAAK,CAAE,IAAsB,CAG3B,OAAO,CAAE,KAAK,CAed,YAAoB,CAAE,QAA+B,CACrD,KAAK,CAAE,SAAuC,CAE9C,4CAAa,CACX,YAAoB,CAAE,CAAC,CCA7B,iDAAwB,CACtB,YAAoB,CAAE,CAAC,CAEvB,mDAA0B,CACxB,KAAK,CALY,IAAkC,CJqEzD,iCAAiC,CG1F7B,KAAK,CAAE,IAAsB,CAG3B,OAAO,CAAE,KAAK,CAed,YAAoB,CAAE,QAA+B,CACrD,KAAK,CAAE,SAAuC,CAE9C,4CAAa,CACX,YAAoB,CAAE,CAAC,CCA7B,iDAAwB,CACtB,YAAoB,CAAE,CAAC,CAEvB,mDAA0B,CACxB,KAAK,CALY,IAAkC,CJ0EzD,uDAAuD,CACrD,MAAM,CAAE,SAA2B,CACnC,SAAS,CAAE,GAAG,CAEhB,oBAAoB,CAClB
 ,OAAO,CAAE,YAAY,CACrB,MAAM,CAAE,SAA2B,CACnC,SAAS,CAAE,GAAG,CAOZ,osBAAqP,CACnP,KAAK,CAAE,IAAI,CAIjB,uBAAuB,CACrB,OAAO,CAAE,YAAY,CACrB,YAAY,CAAE,KAAK,CACnB,KAAK,CAAE,IAAI,CACX,cAAc,CAAE,MAAM,CACtB,SAAS,CAAE,GAAG,CAEhB,gBAAgB,CACd,OAAO,CAAE,KAAK,CACd,KAAK,CN7H+B,IAAI,CM8HxC,SAAS,CAAE,GAAG,CACd,UAAU,CAAE,QAAO,CACnB,UAAU,CAAE,MAAM,CAClB,kBAAC,CACC,SAAS,CAAE,OAAO,CAClB,UAAU,CAAE,MAAM,CAClB,aAAa,CAAE,GAAqB,CACtC,6BAAY,CACV,aAAa,CAAE,CAAC,CA4DpB,KAAK,CACH,WAAW,CAAE,MAAM,CAGnB,6DAAmD,CACjD,kBAAkB,CAAE,MAAM,CAC1B,MAAM,CAAE,OAAO,CACf,WAAW,CJ/MuB,uDAAM,CIgNxC,SAAS,CAAE,OAAO,CACpB,gSAAqP,CACnP,kBAAkB,CAAE,IAAI,CACxB,OAAO,CAAE,GAAqB,CAC9B,OAAO,CAAE,YAAY,CACrB,MAAM,CAAE,cAA6B,CACrC,SAAS,CAAE,GAAG,CACd,WAAW,CJvNuB,uDAAM,CIwNxC,UAAU,CAAE,oBAAmC,CAC/C,aAAa,CAAE,CAAC,CtBxNZ,kBAAoB,CAAE,kBAAM,CAK5B,eAAiB,CAAE,kBAAM,CAezB,UAAY,CAAE,kBAAM,CsBuM1B,4BAAwB,CACtB,OAAO,CAAE,iBAAkB,CAC7B,eAAW,CACT,MAAM,CAAE,OAAO,CACjB,0CAAmC,CtB/N7B,kBAAoB,CsBgOZ,UAAU,CtB3NlB,eAAiB,CsB2NT,UAAU,CtB5MlB,UAAY,CsB4MJ,UAAU,CACtB,OA
 AO,CAAE,CAAC,CACV,YAAY,CAAE,QAAO,CACrB,OAAO,CAAE,IAAI,CACb,MAAM,CAAE,IAAI,CACd,oBAAgB,CtBrOV,kBAAoB,CsBsOZ,UAAU,CtBjOlB,eAAiB,CsBiOT,UAAU,CtBlNlB,UAAY,CsBkNJ,UAAU,CACtB,kGAA6D,CAC3D,kBAAkB,CAAE,IAAI,CAC5B,oXAAyU,CACvU,OAAO,CAAE,CAAC,CACV,OAAO,CAAE,cAAc,CACvB,YAAY,CNxLsB,IAAU,CMyL9C,oBAAgB,CACd,YAAY,CAAE,eAA8B,CAC9C,+EAAqE,CACnE,OAAO,CAAE,gBAAsB,CAC/B,OAAO,CAAE,gBAAgB,CAC3B,4aAAiY,CAC/X,MAAM,CAAE,WAAW,CACnB,gBAAgB,CAAE,OAAmC,CAEzD,+DAAiE,CAC/D,KAAK,CNzN+B,OAAI,CM0NxC,MAAM,CAAE,iBAAc,CACxB,iFAAmF,CACjF,YAAY,CN5NwB,OAAI,CM8NxC,yHAA+G,CAC7G,aAAa,CN/NqB,OAAI,CMiO1C,oBAAoB,CAClB,OAAO,CAAE,IAAqB,CAC9B,SAAS,CAAE,IAAI,CAKjB,QAAQ,CACN,QAAQ,CAAE,IAAI,CACd,cAAc,CAAE,GAAG,CACnB,KAAK,CAAE,IAAI,CACX,WAAW,CJ3QyB,uDAAM,CI4Q5C,eAAgB,CACd,OAAO,CAAE,aAAgB,CACzB,OAAO,CAAE,YAAY,CACrB,MAAM,CAAE,cAA6B,CACrC,SAAS,CAAE,GAAG,CACd,UAAU,CAAE,oBAAmC,CtBhRzC,kBAAoB,CAAE,kBAAM,CAK5B,eAAiB,CAAE,kBAAM,CAezB,UAAY,CAAE,kBAAM,CsB+P5B,MAAM,CACJ,MAAM,CAAE,cAA6B,CACrC,gBAAgB,CNpOoB,IAAM,CMqO1C,gBAAW,CACT,MAAM,CAAE,IAAI,CA
 ChB,2BAA4B,CAC1B,OAAO,CAAE,CAAC,CACZ,uFAA2F,CACzF,MAAM,CAAE,WAAW,CACnB,gBAAgB,CAAE,OAAmC,CAKrD,8DAAuD,CACrD,MAAM,CAAE,WAAW,CACvB,sBAAuB,CACrB,MAAM,CAAE,KAAuB,CAE/B,KAAK,CJzS+B,OAAW,CI0S/C,OAAO,CAAE,KAAK,CACd,kCAAK,CACH,cAAc,CAAE,QAAQ,CAI5B,uBAAuB,CACrB,OAAO,CAAE,YAAY,CACrB,QAAQ,CAAE,MAAM,CAChB,KAAK,CAAE,CAAC,CACR,cAAc,CAAE,MAAM,CAuBxB,iCAAkC,CAChC,WAAW,CAAE,MAAM,CACnB,OAAO,CAAE,GAAqB,CAC9B,qEAAiB,CACf,WAAW,CAAE,IAAI,CACjB,OAAO,CAAE,KAAK,CACd,OAAO,CAAE,YAAY,CACrB,SAAS,CAAE,GAAG,CACd,gBAAgB,CNjRkB,OAAmB,CMkRrD,MAAM,CAAE,cAA6B,CACrC,KAAK,CN7U6B,IAAI,CM+U1C,kCAAkC,CAChC,WAAW,CAAE,CAAC,CAChB,kCAAkC,CAChC,YAAY,CAAE,CAAC,CAcjB,UAAU,CACR,KAAK,CAAE,IAAuB,CAC9B,MAAM,CAAE,IAAqB,CAC7B,MAAM,CAAE,MAAwB,CAChC,QAAQ,CAAE,QAAQ,CAClB,aAAa,CAAE,GAAG,CAClB,UAAU,CNrW0B,IAAI,CMsWxC,MAAM,CAAE,OAAO,CtB5WT,kBAAoB,CAAE,oBAAM,CAK5B,eAAiB,CAAE,oBAAM,CAezB,UAAY,CAAE,oBAAM,CsB0V1B,iBAAQ,CACN,QAAQ,CAAE,QAAQ,CAClB,OAAO,CAAE,EAAE,CACX,OAAO,CAAE,KAAK,CACd,KAAK,CAAE,IAAI,CACX,MAAM,CAAE,IAAI,CACZ,aAAa,CAAE,GAAG,CAClB,U
 AAU,CNhXwB,IAAI,CMiXtC,IAAI,CAAE,IAAI,CACV,GAAG,CAAE,IAAI,CtBvXL,kBAAoB,CAAE,oBAAM,CAK5B,eAAiB,CAAE,oBAAM,CAezB,UAAY,CAAE,oBAAM,CsBqW1B,gBAAO,CACL,OAAO,CAAE,OAAO,CAChB,QAAQ,CAAE,QAAQ,CAClB,IAAI,CAAE,IAAqB,CAC3B,OAAO,CAAE,KAAK,CACd,SAAS,CAAE,IAAI,CACf,KAAK,CNzX6B,IAAI,CM0X1C,iBAAiB,CACf,UAAU,CAAE,OAAmB,CAC/B,wBAAQ,CACN,IAAI,CN5W8B,IAAI,CM6WtC,UAAU,CNtUwB,OAAM,CMuU1C,uBAAO,CACL,OAAO,CAAE,MAAM,CAEnB,8CAA+C,CAC7C,MAAM,CAAE,WAAW,CAiDnB,wGAAyB,CACvB,KAAK,CN7Z6B,OAAI,CM+ZtC,81BAAqP,CACnP,MAAM,CAAE,iBAAc,CAC1B,iDAAQ,CACN,MAAM,CAAE,iBAAc,CAE1B,mBAAmB,CACjB,WAAW,CAAE,MAAM,CACnB,qCAAiB,CACf,OAAO,CAAE,aAAgB,CACzB,OAAO,CAAE,YAAY,CACrB,SAAS,CAAE,GAAG,CAClB,gEAAgE,CAC9D,KAAK,CN3Y+B,OAAM,CM8Y5C,+DAA+D,CAC7D,KAAK,CN/a+B,OAAI,CMkb1C,gEAAgE,CAC9D,KAAK,CNlc+B,OAAO,CMqc7C,6DAA6D,CAC3D,KAAK,CN9Y+B,OAAW,CMoZjD,UAAU,CtB3dF,iBAAoB,CAAE,aAAM,CAK5B,cAAiB,CAAE,aAAM,CAKzB,aAAgB,CAAE,aAAM,CAKxB,YAAe,CAAE,aAAM,CAKvB,SAAY,CAAE,aAAM,CsByc5B,WAAW,CtB7dH,iBAAoB,CAAE,cAAM,CAK5B,cAAiB,CAAE,cAAM,CAKzB,aAAgB,CAAE,cAAM,CA
 KxB,YAAe,CAAE,cAAM,CAKvB,SAAY,CAAE,cAAM,CsB2c5B,WAAW,CtB/dH,iBAAoB,CAAE,cAAM,CAK5B,cAAiB,CAAE,cAAM,CAKzB,aAAgB,CAAE,cAAM,CAKxB,YAAe,CAAE,cAAM,CAKvB,SAAY,CAAE,cAAM,CsB6c5B,OAAO,CtBjeC,iBAAoB,CAAE,UAAM,CAK5B,cAAiB,CAAE,UAAM,CAKzB,aAAgB,CAAE,UAAM,CAKxB,YAAe,CAAE,UAAM,CAKvB,SAAY,CAAE,UAAM,CsB+c1B,iBAAW,CtBneL,iBAAoB,CsBoeL,wBAAwB,CtB/dvC,cAAiB,CsB+dF,wBAAwB,CtB1dvC,aAAgB,CsB0dD,wBAAwB,CtBrdvC,YAAe,CsBqdA,wBAAwB,CtBhdvC,SAAY,CsBgdG,wBAAwB,CAC7C,kBAAY,CtBreN,iBAAoB,CsBseL,yBAAyB,CtBjexC,cAAiB,CsBieF,yBAAyB,CtB5dxC,aAAgB,CsB4dD,yBAAyB,CtBvdxC,YAAe,CsBudA,yBAAyB,CtBldxC,SAAY,CsBkdG,yBAAyB,CAC9C,kBAAY,CtBveN,iBAAoB,CsBweL,yBAAyB,CtBnexC,cAAiB,CsBmeF,yBAAyB,CtB9dxC,aAAgB,CsB8dD,yBAAyB,CtBzdxC,YAAe,CsBydA,yBAAyB,CtBpdxC,SAAY,CsBodG,yBAAyB,CAEhD,yCAAyC,CAErC,8BAAqB,CACnB,MAAM,CAAE,SAAS,CAEjB,8ZAAqP,CACnP,aAAa,CAAE,KAAK,CACpB,OAAO,CAAE,KAAK,CAClB,cAAK,CACH,aAAa,CAAE,KAAK,CACpB,OAAO,CAAE,KAAK,CAEhB,kYAAqO,CACnO,aAAa,CAAE,CAAC,CAElB,wCAAuB,CACrB,aAAa,CAAE,KAAK,CACpB,UAAU,CAAE,IAAI,CAChB,OAAO,CAAE,
 KAAK,CACd,KAAK,CAAE,IAAI,CACb,4BAAW,CACT,MAAM,CAAE,WAAW,CACvB,iEAAmE,CACjE,OAAO,CAAE,KAAK,CACd,SAAS,CAAE,GAAG,CACd,OAAO,CAAE,KAAuB,EH5ehC,oCAAsB,CQhC1B,YAAY,CAER,OAAO,CAAE,IAAI,ER8Bb,oCAAsB,CQ5B1B,YAAY,CAER,OAAO,CAAE,IAAI,EAEjB,WAAW,CACT,KAAK,CAAE,IAAI,CAEb,YAAY,CACV,KAAK,CAAE,KAAK,CAEd,WAAW,CACT,KAAK,CAAE,IAAI,CC4Cb,mEAAS,CACP,eAAe,CAAE,QAAQ,CACzB,cAAc,CAAE,CAAC,CACjB,WAAW,CAAE,IAAI,CACjB,aAAa,CZ/BuB,IAAI,CYgCxC,2FAAO,CACL,KAAK,CAAE,IAAI,CACX,IAAI,CAAE,6BAAkB,CACxB,OAAO,CAAE,KAAK,CACd,UAAU,CAAE,MAAM,CACpB,yJAAM,CACJ,SAAS,CZjByB,GAAG,CYkBrC,MAAM,CAAE,CAAC,CACT,QAAQ,CAAE,OAAO,CACjB,OAAO,CZnB2B,QAAmC,CYoBvE,iOAA8B,CAC5B,iBAAiB,CAAE,CAAC,CACtB,qFAAK,CACH,KAAK,CAAE,IAAI,CACX,UAAU,CAAE,IAAI,CAChB,cAAc,CAAE,MAAM,CACtB,WAAW,CAAE,MAAM,CACnB,8FAAE,CACA,WAAW,CZnDqB,IAAI,CYoDpC,aAAa,CAAE,iBAA6B,CAChD,4EAAE,CACA,gBAAgB,CAAE,WAAW,CAC7B,cAAc,CAAE,MAAM,CAE1B,kFAAc,CACZ,WAAW,CAAE,IAAuB,CACpC,mHAAY,CACV,aAAa,CAAE,CAAC,CACpB,4HAA4B,CAC1B,KAAK,CAAE,EAAE,CACT,aAAa,CAAE,CAAC,CAChB,uXAA0C,CACxC,MAAM,CAAE
 ,CAAC,CAEb,mBAAmB,CACjB,KAAK,CZxD+B,IAAwB,CYyD5D,SAAS,CAAE,GAAG,CAChB,kBAAkB,CAChB,KAAK,CZ3D+B,IAAwB,CY4D5D,SAAS,CAAE,GAAG,CAIhB,2HAAyD,CACvD,gBAAgB,CZpCoB,OAAmB,CYsCzD,gBAAgB,CACd,gBAAgB,CZvCoB,OAAmB,CY4CzD,kDAAsB,CACpB,MAAM,CAAE,iBAA6B,CACrC,wDAAE,CACA,aAAa,CAAE,iBAA6B,CAC5C,WAAW,CAAE,iBAA6B,CAC5C,gGAAwB,CACtB,mBAAmB,CAAE,CAAC,CAE1B,kBAAkB,CAChB,MAAM,CAAE,iBAA6B,CAGrC,0BAAE,CACA,aAAa,CAAE,iBAA6B,CAC9C,8CAAwB,CACtB,mBAAmB,CAAE,CAAC,CAGxB,2CAAwB,CACtB,mBAAmB,CAAE,CAAC,CACxB,+CAAM,CACJ,YAAY,CAAE,SAAS,CACvB,aAAa,CAAE,iBAA6B,CAC9C,2CAAwB,CACtB,mBAAmB,CAAE,CAAC,CAG1B,oBAAoB,CAClB,aAAa,CZhHuB,IAAI,CYiHxC,SAAS,CAAE,IAAI,CACf,QAAQ,CAAE,IAAI,CACd,0BAAK,CACH,aAAa,CAAE,YAAY,CAC3B,2DAAM,CACJ,WAAW,CAAE,MAAM,CCzIzB,CAAC,CACC,KAAK,CbkE+B,OAAW,CajE/C,eAAe,CAAE,IAAI,CACrB,MAAM,CAAE,OAAO,CACf,OAAO,CACL,KAAK,CbgD6B,OAAwB,Ca/C5D,SAAS,CACP,KAAK,Cb6C6B,OAAO,CanB7C,IAAI,CACF,MAAM,CAAE,IAAI,CACZ,UAAU,CAAE,MAAM,CAEpB,IAAI,CACF,WAAW,CX3CyB,uDAAM,CW4C1C,WAAW,CAAE,MAAM,CACnB,KAAK,CX/C+B,OAAW,CWgD/C,UAAU,CAAE,
 IAAI,CAChB,UAAU,CAAE,MAAM,CAClB,UAAU,CbnD0B,OAAO,CaqD7C,aAAa,CACX,UAAU,CAAE,IAAI,CAElB,eAAe,CACb,UAAU,CAAE,MAAM,CAEpB,cAAc,CACZ,UAAU,CAAE,KAAK,CAEnB,cAAc,CACZ,SAAS,CAAE,IAAI,CAEjB,eAAe,CACb,SAAS,CAAE,IAAI,CAEjB,oBAAqB,CACnB,SAAS,CAAE,GAAG,CAEhB,eAAe,CACb,eAAe,CAAE,YAAY,CAE/B,gBAAgB,CACd,KAAK,CAAE,kBAAkB,CAC3B,uBAAuB,CACrB,KAAK,CAAE,kBAAgC,CACzC,aAAa,CACX,KAAK,CAAE,kBAAgB,CACzB,oBAAoB,CAClB,KAAK,CAAE,kBAA8B,CACvC,gBAAgB,CACd,KAAK,CAAE,kBAAiB,CAC1B,uBAAuB,CACrB,KAAK,CAAE,kBAA+B,CACxC,eAAe,CACb,KAAK,CAAE,kBAAe,CACxB,sBAAsB,CACpB,KAAK,CAAE,kBAA6B,CACtC,gBAAgB,CACd,KAAK,CAAE,kBAAsB,CAC/B,uBAAuB,CACrB,KAAK,CAAE,kBAAoC,CAkB7C,gEAAyB,CACvB,UAAU,CAAE,CAAC,CACb,WAAW,CAAE,GAAG,CAChB,WAAW,CX9GyB,0DAAa,CWgHnD,CAAC,CACC,WAAW,Cb1FyB,IAAI,Ca2FxC,MAAM,CAAE,CAAC,CACT,SAAS,Cb/F2B,IAAI,CagGxC,aAAa,Cb7FuB,IAAI,Ca+F1C,EAAE,CACA,SAAS,CAAE,IAAI,CAEjB,0CAAE,CACA,SAAS,CAAE,IAAI,CAEjB,EAAE,CACA,SAAS,CAAE,IAAI,CAEjB,EAAE,CACA,SAAS,CAAE,IAAI,CAEjB,EAAE,CACA,SAAS,CAAE,IAAI,CAEjB,EAAE,CACA,SAAS,CAAE,IAAI,CAEjB,EA
 AE,CACA,OAAO,CAAE,KAAK,CACd,MAAM,CAAE,GAAG,CACX,MAAM,CAAE,CAAC,CACT,UAAU,CAAE,iBAA6B,CACzC,MAAM,CAAE,MAAmB,CAC3B,OAAO,CAAE,CAAC,CAEZ,sCAAI,CACF,WAAW,CAAE,MAAM,CACnB,SAAS,CAAE,IAAI,CACf,UAAU,CblG0B,IAAM,CamG1C,MAAM,CAAE,iBAAiC,CACzC,SAAS,CAAE,GAAG,CACd,OAAO,CAAE,KAAK,CACd,WAAW,CXrJyB,wMAAQ,CWsJ5C,KAAK,Cb1H+B,OAAI,Ca2HxC,UAAU,CAAE,IAAI,CAChB,0CAAY,CACV,SAAS,CAAE,GAAG,CAmClB,wFAAmB,CACjB,UAAU,CAAE,IAAI,CAChB,WAAW,CbzKyB,IAAI,Ca0KxC,aAAa,Cb1KuB,IAAI,Ca2KxC,oGAAE,CACA,UAAU,CAAE,IAAI,CAChB,WAAW,Cb7KuB,IAAI,Ca8KtC,wJAAY,CACV,aAAa,CAAE,CAAC,CAClB,gHAAE,CACA,aAAa,CAAE,CAAC,CAClB,gHAAE,CACA,UAAU,CAAE,MAAM,CAClB,4HAAE,CACA,UAAU,CAAE,MAAM,CACtB,4HAAK,CACH,UAAU,CAAE,OAAO,CAEzB,iFAAsB,CACpB,UAAU,CAAE,OAAO,CACnB,WAAW,Cb3LyB,IAAI,Ca4LxC,aAAa,Cb5LuB,IAAI,Ca6LxC,6FAAE,CACA,UAAU,CAAE,OAAO,CACnB,WAAW,Cb/LuB,IAAI,CagMtC,iJAAY,CACV,aAAa,CAAE,CAAC,CAClB,yGAAE,CACA,aAAa,CAAE,CAAC,CAChB,qHAAE,CACA,UAAU,CAAE,IAAI,CCrOxB,kBAAkB,CAChB,MAAM,CAAE,iBAA6B,CACrC,aAAa,CAAE,IAAI,CACnB,OAAO,Cd6B6B,IAAI,Cc5BxC,WAAW,CAA
 E,IAAqB,CAClC,WAAW,CAAE,GAAG,CAChB,UAAU,CdoD0B,IAAM,CcnD1C,QAAQ,CAAE,QAAQ,CAClB,wBAAO,CACL,OAAO,CAAE,SAAS,CAClB,QAAQ,CAAE,QAAQ,CAClB,GAAG,CAAE,GAAG,CACR,IAAI,CAAE,GAAG,CACT,UAAU,CdoDwB,OAAO,CcnDzC,KAAK,CAAE,IAAoB,CAC3B,OAAO,CAAE,QAA2C,CACtD,2CAA0B,CACxB,MAAM,CAAE,iBAA6B,CACrC,aAAa,CdcqB,IAAI,CcZ1C,+GAAmC,CACjC,MAAM,CAAE,iBAA6B,CACrC,OAAO,CAAE,GAAG,CACZ,UAAU,CAAE,IAAI,CAChB,UAAU,CdkC0B,IAAM,CchC1C,MAAM,CAAE,YAAyB,CACjC,gLAAuB,CACrB,MAAM,CAAE,IAAI,CACZ,UAAU,CAAE,IAAI,CAChB,MAAM,CAAE,CAAC,CAEb,+BAA+B,CAC7B,KAAK,CAAE,IAAI,CACb,cAAc,CACZ,YAAY,CAAE,iBAA0C,CACxD,MAAM,CAAE,CAAC,CACT,OAAO,CAAE,SAA2C,CACpD,WAAW,CZ3ByB,wMAAQ,CY4B5C,SAAS,CAAE,IAAI,CACf,WAAW,CAAE,GAAG,CAChB,KAAK,CdI+B,OAAwB,CcH9D,2BAA2B,CACzB,WAAW,CAAE,GAAG,CAChB,MAAM,CAAE,CAAC,CACT,OAAO,CAAE,SAA2C,CACpD,WAAW,CZnCyB,wMAAQ,CYoC5C,SAAS,CAAE,IAAI,CACf,WAAW,CAAE,GAAG,CAChB,OAAO,CAAE,KAAK,CACd,QAAQ,CAAE,IAAI,CACd,KAAK,CZ7C+B,OAAW,CYiDjD,YAAY,CACV,2IAAgE,CAC9D,WAAW,CAAE,QAAQ,ECzDzB,IAAI,CACF,gBAAgB,CAAE,IAAO,CACzB,MAAM,CAAE,OAAO,CACf,
 OAAO,CAAE,MAAM,CACf,OAAO,CAAE,KAAK,CAChB,EAAE,CACA,KAAK,CAAE,IAAO,CACd,UAAU,CAAE,MAAM,CACpB,IAAI,CACF,KAAK,CAAE,OAAO,CACd,gBAAgB,CAAE,OAAO,CAC3B,EAAE,CACA,WAAW,CAAE,IAAI,CACnB,EAAE,CACA,WAAW,CAAE,IAAI,CACnB,GAAG,CACD,KAAK,CAAE,IAAO,CACd,UAAU,CAAE,MAAM,CACpB,GAAG,CACD,KAAK,CAAE,IAAO,CACd,WAAW,CAAE,IAAI,CACnB,GAAG,CACD,KAAK,CAAE,IAAO,CACd,UAAU,CAAE,MAAM,CACpB,GAAG,CACD,KAAK,CAAE,IAAO,CACd,WAAW,CAAE,IAAI,CACjB,UAAU,CAAE,MAAM,CACpB,GAAG,CACD,KAAK,CAAE,IAAO,CACd,gBAAgB,CAAE,IAAO,CAC3B,MAAM,CACJ,KAAK,CAAE,IAAO,CACd,gBAAgB,CAAE,IAAO,CAC3B,GAAG,CACD,UAAU,CAAE,MAAM,CACpB,GAAG,CACD,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAO,CACd,gBAAgB,CAAE,IAAO,CAC3B,MAAM,CACJ,KAAK,CAAE,IAAO,CACd,gBAAgB,CAAE,IAAO,CAC3B,GAAG,CACD,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,WAAW,CAAE,IAAI,CACnB,GAAG,CACD,KAAK,CAAE,MAAO,CACd,WAAW,CAAE,IAAI,CACnB,GAAG,CACD,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,WAAW,CAAE,IAAI,CACnB,GAAG,CACD,WAAW,CAAE,IAAI,CACnB,GAAG,CACD,WAAW,CAAE,IAA
 I,CACnB,GAAG,CACD,WAAW,CAAE,IAAI,CACnB,GAAG,CACD,WAAW,CAAE,IAAI,CACnB,GAAG,CACD,KAAK,CAAE,IAAO,CACd,WAAW,CAAE,IAAI,CACnB,EAAE,CACA,KAAK,CAAE,IAAO,CAChB,EAAE,CACA,KAAK,CAAE,IAAO,CAChB,EAAE,CACA,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAI,CACb,GAAG,CACD,KAAK,CAAE,OAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAO,CACd,WAAW,CAAE,IAAI,CACnB,GAAG,CACD,KAAK,CAAE,IAAI,CACb,GAAG,CACD,KAAK,CAAE,MAAM,CACf,GAAG,CACD,KAAK,CAAE,IAAO,CACd,WAAW,CAAE,IAAI,CACnB,GAAG,CACD,KAAK,CAAE,IAAO,CACd,WAAW,CAAE,IAAI,CACnB,GAAG,CACD,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAI,CACb,GAAG,CACD,KAAK,CAAE,IAAI,CACb,GAAG,CACD,WAAW,CAAE,IAAI,CACnB,EAAE,CACA,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,KAAK,
 CAAE,IAAO,CAChB,GAAG,CACD,KAAK,CAAE,OAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,KAAK,CAAE,OAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAI,CACb,GAAG,CACD,KAAK,CAAE,IAAI,CACb,GAAG,CACD,KAAK,CAAE,IAAI,CACb,GAAG,CACD,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAI,CACX,gBAAgB,CAAE,OAAO,CCjJ3B,kBAAkB,CAChB,OAAO,CAAE,YAAY,CACrB,uCAAsB,CACpB,KAAK,CAAE,KAAK,CACd,oBAAC,CACC,OAAO,CAAE,YAAY,CACrB,OAAO,CAAE,GAAG,CACZ,gCAAa,CACX,YAAY,CAAE,CAAC,CACnB,6FAAI,CACF,OAAO,CAAE,GAAG,CACZ,MAAM,CAAE,IAAI,CACZ,UAAU,CAAE,IAAI,CAChB,qHAAS,CACP,KAAK,CdR2B,OAAW,CcSjD,qBAAqB,CACnB,aAAa,CAAE,CAAC,CAChB,KAAK,ChB2B+B,OAAwB,CgB1B5D,SAAS,CAAE,GAAG,CACd,OAAO,CAAE,YAAY,CbanB,oCAAsB,CaTxB,qBAAqB,CACnB,OAAO,CAAE,IAAI,CACf,uCAAuC,CACrC,OAAO,CAAE,IAAI,EAEjB,YAAY,CACV,uCAAuC,CACrC,OAAO,CAAE,IAAI,EC9BjB,SAAS,CACP,QAAQ,CAAE,KAAK,CACf,GAAG,CCAO,OAAO,CDGjB,gBAAO,CACL,eAAe,CAAE,IAAI,CAEzB,cAAc,C/B+FZ,KAAK,CAAE,CAAC,CACR,0CAAS,CAEP,OAAO,CAAE,KAAK,CACd,OAAO,CAAE,EAAE,CACb,oBAAO,CACL,KAAK,CAAE,IAAI,C+BnGb,
 mCAAM,CACJ,OAAO,CAAE,YAAY,CACvB,uBAAQ,CACN,UAAU,CAAE,qBAAoB,CAEhC,6BAAa,CACX,WAAW,CAAE,iBAAyB,CACxC,8BAAc,CACZ,YAAY,CAAE,iBAAyB,CAC3C,gBAAC,CACC,MAAM,CAAE,IAAmB,CAC3B,OAAO,CAAE,YAAY,CACrB,WAAW,CAAE,IAAmB,CAChC,OAAO,CAAE,MAAiB,CAG5B,oDAAiB,CACf,MAAM,CAAE,IAAmB,CAC3B,OAAO,CAAE,YAAY,CACrB,WAAW,CAAE,IAAmB,CAChC,OAAO,CAAE,SAAS,CAClB,aAAa,CAAE,CAAC,CAChB,OAAO,CAAE,KAAK,CACd,WAAW,CAAE,IAAI,CACjB,cAAc,CAAE,SAAS,CACzB,SAAS,CAAE,GAAG,CACd,KAAK,CjBvB6B,IAAI,CiBwBtC,WAAW,CAAE,MAAM,CAErB,oBAAE,CACA,aAAa,CAAE,CAAC,CAEhB,+BAAY,CACV,UAAU,CAAE,iBAAyB,CACvC,kCAAe,CACb,aAAa,CAAE,iBAAyB,CAC1C,4BAAS,CACP,UAAU,CAAE,OAAsC,CAClD,8BAAC,CACC,KAAK,CjBNyB,IAAwB,CiBOtD,YAAY,CAAE,iBAAgD,CAC9D,OAAO,CAAE,gBAAyB,CAClC,oCAAO,CACL,UAAU,CAAE,OAAsC,CACxD,mGAAI,CACF,MAAM,CAAE,IAAI,CACZ,UAAU,CAAE,OAAO,CACnB,KAAK,CAAE,OAAO,CACd,YAAY,CAAE,CAAC,CACf,aAAa,CAAE,CAAC,CAElB,wCAAmB,CACjB,OAAO,CAAE,KAAK,CACd,KAAK,CAAE,IAAI,CACX,WAAW,CAAE,MAAM,CAGnB,SAAS,CAAE,KAAI,CACf,WAAW,CAAE,KAAK,CAClB,KAAK,CAAE,OAAyB,CAGpC,wDAAuB,CACrB,KAAK,C
 fnE6B,OAAW,CeoE7C,OAAO,CAAE,gBAAmB,CAC5B,WAAW,CAAE,IAAI,CACjB,QAAQ,CAAE,QAAQ,CAClB,UAAU,CjBtEwB,OAAyB,CiBuE3D,MAAM,CAAE,IAAI,CACZ,aAAa,CAAE,iBAAgD,CAC/D,UAAU,CAAE,iBAAgD,CAC5D,YAAY,CAAE,YAAY,CAE1B,oEAAO,CACL,UAAU,CjB7EsB,OAAyB,CiB8EzD,4GAAmB,CACjB,KAAK,CjB3CyB,IAAwB,CiB4C1D,gGAAmB,CAGjB,OAAO,CAAE,KAAK,CACd,SAAS,CAAE,KAAI,CACf,WAAW,CAAE,KAAK,CAClB,KAAK,CAAE,IAAyB,CAIlC,iHAAI,CACF,OAAO,CAAE,IAAI,CACf,iIAAc,CACZ,OAAO,CAAE,KAAK,CAGd,yCAAG,CACD,UAAU,CAAE,OAAsC,CAClD,OAAO,CAAE,gBAAyB,CACpC,uDAAiB,CACf,OAAO,CAAE,KAAK,CACd,UAAU,CAAE,OAAsC,CAClD,OAAO,CAAE,gBAAyB,CACtC,2DAA2B,CACzB,KAAK,CjBpE2B,IAAwB,CiBqE1D,mDAAmB,CACjB,KAAK,CAAE,OAAsC,CACjD,+BAAa,CACX,SAAS,CAAE,KAAI,CAEb,yCAAG,CACD,UAAU,CAAE,OAAsC,CAClD,OAAO,CAAE,gBAAyB,CACpC,uDAAiB,CACf,OAAO,CAAE,KAAK,CACd,UAAU,CAAE,OAAsC,CAClD,OAAO,CAAE,gBAAyB,CAClC,UAAU,CAAE,IAAI,CAChB,aAAa,CAAE,IAAI,CACvB,2DAA2B,CACzB,KAAK,CjBpF2B,IAAwB,CiBqF1D,mDAAmB,CACjB,KAAK,CAAE,OAAsC,CACjD,+BAAa,CACX,SAAS,CAAE,KAAI,CAEjB,+BAAa,CACX,OAAO,CAAE,KAAK,CAChB,uBAAK,CACH,
 aAAa,CAAE,CAAC,CAChB,OAAO,CAAE,IAAI,CAEb,kCAAK,CACH,OAAO,CAAE,KAAK,CAClB,4BAAU,CACR,aAAa,CAAE,CAAC,CAChB,KAAK,CjBnG6B,OAAwB,CiBoG1D,WAAW,CAAE,MAAM,CACrB,mBAAC,CACC,OAAO,CAAE,YAAY,CACrB,WAAW,CAAE,IAAI,CACjB,OAAO,CAAE,gBAAmB,CAC5B,OAAO,CAAE,KAAK,CACd,QAAQ,CAAE,QAAQ,CAClB,SAAS,CAAE,GAAG,CACd,KAAK,CjB5G6B,OAAwB,CiB6G1D,yBAAO,CACL,gBAAgB,CAAE,OAAoC,CACtD,MAAM,CAAE,OAAO,CACf,6CAAmB,CACjB,KAAK,CjBjHyB,OAAwB,CiBkH1D,0BAAQ,CACN,gBAAgB,CjB/EgB,OAAW,CiBgF3C,MAAM,CAAE,OAAO,CACf,KAAK,CjBvG2B,IAAM,CiBwGtC,8CAAmB,CACjB,KAAK,CjBzGyB,IAAM,CiB2G5C,mBAAmB,CACjB,OAAO,CjBhF6B,GAAG,CiBiFvC,gBAAgB,CjBvFoB,OAAW,CiBwF/C,UAAU,CAAE,MAAM,CAClB,OAAO,CAAE,OAAW,CACpB,OAAO,CAAE,KAAK,CACd,KAAK,CjBpK+B,OAAyB,CiBqK7D,aAAa,CAAE,OAAW,CAC1B,oCAAgB,CACd,KAAK,CAAE,IAAI,CACX,aAAa,CAAE,IAAI,CACnB,OAAO,CAAE,QAAQ,CACjB,YAAY,CAAE,OAAuB,CACvC,uBAAG,CACD,OAAO,CAAE,KAAK,CACd,MAAM,CAAE,sBAA0B,CAClC,MAAM,CAAE,IAAI,CACZ,KAAK,CAAE,IAAI,CACX,gBAAgB,CjBvGkB,OAAW,CiBwG7C,OAAO,CAAE,GAAG,CACZ,aAAa,CAAE,IAAI,CACrB,wDAAqB,CACnB,KAAK,CjBpL6B
 ,OAAyB,CiBqL3D,SAAS,CAAE,IAAI,CACf,WAAW,CAAE,IAAI,CACjB,OAAO,CAAE,YAAY,CACrB,OAAO,CAAE,OAA2C,CACpD,aAAa,CAAE,OAAW,CAE1B,oEAAO,CACL,UAAU,CAAE,qBAAoB,CAClC,0EAAQ,CACN,OAAO,CAAE,KAAK,CACd,MAAM,CAAE,MAAM,CACd,MAAM,CAAE,IAAI,CACZ,KAAK,CAAE,IAAI,CACX,aAAa,CAAE,CAAC,CAChB,SAAS,CAAE,IAAI,CACf,UAAU,CAAE,WAAa,CAEzB,oFAAQ,CACN,UAAU,CAAE,MAAM,CACxB,+BAAa,CACX,UAAU,CAAE,SAAkB,CAC9B,aAAa,CAAE,OAAW,CAC1B,WAAW,CAAE,MAAM,CACnB,KAAK,CAAE,qBAAoB,CAI7B,gCAAM,CACJ,KAAK,CjBxI6B,OAAW,CiByI/C,2BAAC,CACC,KAAK,CjB9K6B,OAAwB,CiB+K1D,iCAAO,CACL,gBAAgB,CjB5IgB,OAAW,CiB6I3C,KAAK,CjBnK2B,IAAM,CiBqK5C,gBAAgB,CjCtNR,kBAAoB,CAAE,gBAAM,CAK5B,eAAiB,CAAE,gBAAM,CAezB,UAAY,CAAE,gBAAM,CiCoM1B,QAAQ,CAAE,QAAQ,CAClB,OAAO,CAAE,CAAC,CACV,KAAK,CAAE,IAAI,CACX,OAAO,CAAE,CAAC,CACV,4BAAa,CACX,IAAI,CAAE,CAAC,CACP,KAAK,CAAE,IAAI,CACX,OAAO,CAAE,CAAC,CACZ,0BAAW,CACT,KAAK,CAAE,IAAI,CACX,IAAI,CAAE,KAAK,CACX,OAAO,CAAE,CAAC,CACZ,2BAAY,CACV,KAAK,CAAE,KAAK,CACZ,IAAI,CAAE,IAAI,CACV,OAAO,CAAE,CAAC,CAGd,gBAAgB,CACd,UAAU,CAAE,qBAAuC,CACnD,gBAAgB
 ,CAAE,2uCAA2uC,CAC7vC,eAAe,CAAE,SAAsB,CAEzC,gBAAgB,CACd,QAAQ,CAAE,QAAQ,CAClB,KAAK,CAAE,IAAI,CACX,MAAM,CAAE,IAAI,CAEd,YAAY,CACV,QAAQ,CAAE,KAAK,CACf,GAAG,CAAE,CAAC,CACN,MAAM,CAAE,CAAC,CACT,IAAI,CAAE,CAAC,CACP,cAAc,CAAE,GAAG,CACnB,KAAK,CjBlL+B,KAAK,CiBmLzC,UAAU,CAAE,MAAM,CAClB,UAAU,CAAE,MAAM,CAClB,UAAU,CAAE,IAAI,CAChB,UAAU,CjBxLsB,OAAe,CiByL/C,OAAO,CjBlL6B,GAAG,CiBoLzC,WAAW,CACT,OAAO,CAAE,IAAI,CACb,UAAU,CjB5L0B,OAAW,CiB6L/C,KAAK,CjBnN+B,IAAM,CiBoN1C,OAAO,CAAE,gBAAuB,CAChC,QAAQ,CAAE,QAAQ,CAClB,WAAW,CAAE,IAAI,CACjB,UAAU,CAAE,MAAM,CAClB,SAAS,CAAE,IAAI,C/B3Kf,KAAK,CAAE,CAAC,CACR,oCAAS,CAEP,OAAO,CAAE,KAAK,CACd,OAAO,CAAE,EAAE,CACb,iBAAO,CACL,KAAK,CAAE,IAAI,C+BuKb,aAAC,CACC,KAAK,CjB3N6B,IAAM,CiB4NxC,WAAW,CAAE,IAAI,CAEnB,eAAG,CACD,YAAY,CAAE,IAAqB,CACnC,MAAM,CAAE,IAAI,CACZ,KAAK,CAAE,IAAI,CACX,gBAAgB,CjB5MkB,OAAW,CiB6M7C,OAAO,CAAE,GAAG,CACZ,aAAa,CAAE,IAAI,CACrB,aAAC,CACC,SAAS,CAAE,IAAI,CACf,KAAK,CAAE,IAAI,CACX,MAAM,CAAE,OAAO,CAEnB,oBAAoB,CAClB,WAAW,CjBpNyB,KAAK,CiBqNzC,UAAU,CjB/R0B,OAAyB,CiBgS7D
 ,UAAU,CAAE,IAAI,CAElB,eAAe,CACb,OAAO,CAAE,eAAmB,CAC5B,MAAM,CAAE,IAAI,CACZ,SAAS,CAAE,KAAK,CAChB,MAAM,CAAE,IAAI,CAEd,aAAa,CACX,QAAQ,CAAE,KAAK,CACf,KAAK,CAAE,IAAI,CACX,MAAM,CAAE,IAAI,CACZ,UAAU,CAAE,eAAc,CAC1B,OAAO,CAAE,IAAI,CACb,OAAO,CAAE,GAAkB,CAC3B,gBAAI,CACF,OAAO,CAAE,KAAK,CAClB,MAAM,CACJ,KAAK,CjB3S+B,IAAI,CiB4SxC,QAAC,CACC,aAAa,CAAE,IAAqB,CACtC,6FAAgB,CACd,OAAO,CAAE,GAAG,CACZ,WAAW,CfnTuB,wMAAQ,CeoT1C,SAAS,CAAE,GAAG,CACd,UAAU,CAAE,IAAI,CAChB,MAAM,CAAE,IAAI,CACZ,KAAK,CjBpT6B,IAAI,CiBsT1C,mBAAmB,C/B7NjB,KAAK,CAAE,CAAC,CACR,oDAAS,CAEP,OAAO,CAAE,KAAK,CACd,OAAO,CAAE,EAAE,CACb,yBAAO,CACL,KAAK,CAAE,IAAI,C+B2Nb,0BAAU,CACR,aAAa,CjBzSqB,IAAI,CiB0StC,aAAa,CAAE,iBAA6B,CAC5C,cAAc,CjB3SoB,IAAI,CiB4SxC,sCAAsB,CACpB,UAAU,CAAE,iBAA6B,CACzC,WAAW,CjB9SuB,IAAI,CiB+SxC,4BAAY,CACV,SAAS,CAAE,IAAI,CACf,aAAa,CAAE,IAAqB,CACpC,OAAO,CAAE,YAAY,CACvB,wBAAQ,CACN,KAAK,CjBzS6B,IAAwB,CiB0S1D,SAAS,CAAE,GAAG,CdrTd,oCAAsB,CcyTxB,gBAAgB,CACd,UAAU,CjBnVwB,OAAyB,CiBoV7D,WAAW,CACT,OAAO,CAAE,KAAK,CAChB,YAAY,CAER,IAAI,CAAE,M
 AAmB,CAG3B,kBAAO,CACL,KAAK,CAAE,GAAG,CACV,IAAI,CAAE,CAAC,CACX,oBAAoB,CAClB,WAAW,CAAE,CAAC,CACd,oCAAe,CACb,OAAO,CCtWD,OAAO,CDuWf,0BAAO,CACL,QAAQ,CAAE,KAAK,CACf,SAAS,CAAE,IAAI,CACf,IAAI,CAAE,GAAG,CACT,GAAG,CAAE,CAAC,CACN,MAAM,CAAE,IAAI,CACZ,QAAQ,CAAE,MAAM,Ed/UlB,qCAAsB,CckVxB,oBAAoB,CAClB,UAAU,CAAE,gBAAe,CAC7B,eAAe,CACb,MAAM,CAAE,CAAC,CACT,UAAU,CjB/WwB,OAAyB,EiBiX/D,YAAY,CACV,iCAAmC,CACjC,OAAO,CAAE,IAAI,CACf,oBAAoB,CAClB,WAAW,CAAE,CAAC,EE5XlB,aAAa,CACX,QAAQ,CAAE,KAAK,CACf,MAAM,CAAE,CAAC,CACT,IAAI,CAAE,CAAC,CACP,KAAK,CnB6E+B,KAAK,CmB5EzC,KAAK,CnBE+B,OAAyB,CmBD7D,UAAU,CAAE,OAAkC,CAC9C,UAAU,CAAE,kBAAiC,CAC7C,WAAW,CjBAyB,uDAAM,CiBC1C,OAAO,CnB+E6B,GAAG,CmB9EvC,eAAC,CACC,KAAK,CnBqE6B,OAAW,CmBpE7C,eAAe,CAAE,IAAI,CACvB,8BAAgB,CACd,OAAO,CAAE,IAAI,CACf,kCAAoB,CAClB,OAAO,CAAE,IAAqB,CAC9B,gBAAgB,CAAE,OAAkC,CACpD,OAAO,CAAE,KAAK,CACd,UAAU,CAAE,KAAK,CACjB,SAAS,CAAE,GAAG,CACd,MAAM,CAAE,OAAO,CACf,KAAK,CnBiD6B,OAAM,CdgC1C,KAAK,CAAE,CAAC,CACR,kFAAS,CAEP,OAAO,CAAE,KAAK,CACd,OAAO,CAAE,EAAE,CACb,wCAAO,CACL
 ,KAAK,CAAE,IAAI,CiCrFX,uqDAAG,CACD,KAAK,CnBlB2B,OAAyB,CmBmB3D,yFAAQ,CACN,KAAK,CAAE,IAAI,CACb,6CAAU,CACR,KAAK,CAAE,IAAI,CACb,kDAAiB,CACf,gBAAgB,CnBQgB,OAAI,CmBPpC,KAAK,CnB0B2B,IAAM,CmBzBxC,yDAAwB,CACtB,gBAAgB,CnBXgB,OAAO,CmBYvC,KAAK,CnBzB2B,IAAI,CmB0BxC,0CAA8B,CAC5B,OAAO,CAAE,KAAK,CAChB,iCAAmB,CACjB,SAAS,CAAE,GAAG,CACd,OAAO,CAAE,IAAqB,CAC9B,KAAK,CnBE6B,IAAwB,CmBD1D,OAAO,CAAE,IAAI,CACb,oCAAE,CACA,OAAO,CAAE,KAAK,CACd,MAAM,CAAE,GAAG,CACX,MAAM,CAAE,CAAC,CACT,MAAM,CAAE,MAAM,CACd,OAAO,CAAE,CAAC,CACV,UAAU,CAAE,iBAA6C,CAC3D,oCAAE,CACA,OAAO,CAAE,YAAY,CACrB,MAAM,CAAE,CAAC,CACT,sCAAC,CACC,OAAO,CAAE,YAAY,CACrB,OAAO,CAAE,GAAqB,CAC9B,KAAK,CnBjDyB,OAAyB,CmBkD7D,uBAAW,CACT,KAAK,CAAE,IAAI,CACX,MAAM,CAAE,IAAI,CACZ,KAAK,CAAE,IAAI,CACX,IAAI,CAAE,IAAI,CACV,MAAM,CAAE,IAAI,CACZ,SAAS,CnBkByB,KAAK,CmBjBvC,kCAAU,CACR,KAAK,CAAE,IAAI,CACb,mEAAQ,CACN,KAAK,CAAE,IAAI,CACb,qDAA+B,CAC7B,UAAU,CAAE,KAAK,CACjB,+HAAQ,CACN,KAAK,CAAE,IAAI,CACb,gEAAU,CACR,KAAK,CAAE,IAAI,CACf,4CAAoB,CAClB,KAAK,CAAE,IAAI,CACX,MAAM,CAAE,IAAI,
 CACZ,WAAW,CAAE,IAAI,CACjB,OAAO,CAAE,KAAuB,CAChC,OAAO,CAAE,KAAK,CACd,UAAU,CAAE,MAAM,ChBhDpB,oCAAsB,CgBmDxB,aAAa,CACX,KAAK,CAAE,GAAG,CACV,OAAO,CAAE,IAAI,CACb,mBAAO,CACL,OAAO,CAAE,KAAK,CAClB,GAAG,CACD,KAAK,CAAE,IAAI,CACX,MAAM,CAAE,IAAI,ECzEd,gBAAG,CACD,SAAS,CAAE,IAAI,CACf,MAAM,CAAE,eAAe,CAEzB,uBAAU,CACR,aAAa,CpBUqB,IAAI,CoBTtC,iCAAS,CACP,UAAU,CAAE,MAAM,CAEtB,oCAAuB,CACrB,UAAU,CAAE,MAAM,CAGpB,qDAAoC,CAClC,aAAa,CpBCqB,IAAI,CoBUxC,uBAAU,CACR,WAAW,CpBXuB,IAAI,CoBYtC,WAAW,CpBZuB,IAAI,CoBatC,aAAa,CpBbqB,IAAI,CoBmBtC,kTAAK,CACH,aAAa,CAAE,CAAC,CAKlB,qCAAQ,CACN,YAAY,CAAE,GAAG,CAUrB,8BAAiB,CACf,YAAY,CAAE,eAAc,CAC5B,mEAAM,CACJ,UAAU,CAAE,sBAAsB,CAClC,YAAY,CAAE,0BAAyB,CAG3C,0EAAiD,CAC/C,UAAU,CAAE,WAAW,CACzB,0EAAiD,CAC/C,UAAU,CAAE,WAAW,CAGzB,qDAA4B,CAC1B,aAAa,CAAE,IAAqB,CACtC,wBAAW,CACT,WAAW,CpBpDuB,IAAI,CoBuDxC,yBAAY,CACV,WAAW,CAAE,IAAI,CACjB,aAAa,CAAE,IAAqB,CACtC,yBAAY,CACV,KAAK,ClBrF6B,OAAW,CkBsF/C,yBAAY,CACV,KAAK,CAAE,KAAK,CACZ,MAAM,CAAE,iBAA2C,CACrD,wBAAW,CACT,KAAK,CAAE,IAAI,CACX,MAAM,CAAE,iBAA
 2C,CACrD,0BAAa,CACX,MAAM,CAAE,IAAI,CACZ,OAAO,CAAE,KAAK,CAMd,6RAAW,CACT,OAAO,CAAE,IAAI,CACb,UAAU,CAAE,MAAM,CAClB,SAAS,CAAE,IAAI,CAEf,mVAAO,CACL,UAAU,CAAE,OAAO,CACnB,OAAO,CAAE,GAAO,CAChB,WAAW,CAAE,WAAW,CACxB,OAAO,CAAE,YAAY,CACzB,mVAAmB,CACjB,OAAO,CAAE,YAAY,CAGzB,qBAAQ,CACN,KAAK,CAAE,KAAK,CACZ,KAAK,CAAE,GAAG,CACV,OAAO,CAAE,KAAK,CACd,MAAM,CAAE,aAAuC,CAC/C,OAAO,CpB7F2B,IAAI,CoB8FtC,UAAU,CpBtDwB,OAAmB,CoBuDrD,MAAM,CAAE,iBAA6B,CAErC,yEAAS,CACP,SAAS,CAAE,GAAG,CAChB,2BAAK,CACH,aAAa,CAAE,CAAC,CAClB,oCAAc,CACZ,OAAO,CAAE,KAAK,CACd,WAAW,ClB9HqB,0DAAa,CkB+H7C,WAAW,CAAE,IAAI,CACjB,UAAU,CpBrFsB,OAAmB,CoBsFnD,OAAO,CAAE,QAA2C,CACpD,MAAM,CAAE,KAAkB,CAC1B,aAAa,CpB5GmB,IAAI,CoB6GpC,SAAS,CAAE,IAAI,CAEnB,yBAAY,CACV,UAAU,CpBzHwB,OAAO,CoB0HzC,OAAO,CAAE,YAAY,CACrB,WAAW,CAAE,IAAI,CACjB,OAAO,CAAE,KAAuB,CAGlC,iEAAwC,CACtC,cAAc,CAAE,KAAK,CACrB,SAAS,CAAE,GAAG,CAIhB,yEAAgD,CAC9C,UAAU,CAAE,IAAI,CAChB,MAAM,CAAE,IAAI,CACZ,KAAK,CpBjJ6B,IAAI,CoBkJtC,+JAAM,CACJ,MAAM,CAAE,IAAI,CACZ,gBAAgB,CAAE,sBAAsB,CACxC,WAAW,CAAE,MAAM
 ,CACrB,2FAAQ,CACN,YAAY,CAAE,CAAC,CACf,aAAa,CAAE,CAAC,CAChB,cAAc,CAAE,GAAG,CACrB,mKAAI,CACF,KAAK,CpB5J2B,IAAI,CoBmKxC,6BAAgB,CAEd,MAAM,CAAE,IAAI,CACZ,gCAAE,CACA,MAAM,CAAE,IAAI,CACZ,WAAW,CAAE,GAAG,CAClB,uCAAW,CACT,OAAO,CAAE,YAAY,CACrB,UAAU,CAAE,GAAG,CACjB,yCAAW,CACT,aAAa,CAAE,IAAI,CACnB,UAAU,CAAE,IAAI,CAChB,WAAW,CAAE,MAAM,CACrB,yCAAW,CACT,UAAU,CAAE,IAAI,CAChB,YAAY,CAAE,CAAC,CAGnB,iDAAQ,CAEN,KAAK,CpB1L6B,IAAI,CoB2LtC,wHAAO,CACL,SAAS,CAAE,eAAe,CAC1B,WAAW,CAAE,MAAM,CAErB,yEAAS,CACP,KAAK,CpBnK2B,OAAI,CoBoKtC,wHAAW,CACT,WAAW,CAAE,IAAI,CACjB,KAAK,ClBvM2B,OAAW,CkByM/C,uDAAY,CACV,KAAK,CpBhI6B,OAAW,CoBiI/C,eAAE,CACA,aAAa,CpBlLqB,IAAI,CoBmLtC,kBAAE,CACA,WAAW,CAAE,IAAI,CAEnB,6EAAgB,CACd,aAAa,CAAE,eAAgC,CAEjD,kBAAE,CACA,MAAM,CAAE,aAA4C,CAMxD,8BAAiB,CACf,aAAa,CpBjMqB,IAAI,CoBmMtC,iCAAE,CACA,OAAO,CAAE,YAAY,CACrB,MAAM,CAAE,KAAuB,CAC/B,SAAS,CAAE,GAAG,CACd,WAAW,CAAE,MAAM,CACnB,UAAU,CAAE,OAAmB,CAC/B,KAAK,CpBzJ2B,OAAW,CoB0J3C,UAAU,CAAE,iBAA6B,CACzC,OAAO,CAAE,GAAqB,CAC9B,QAAQ,CAAE,QAAQ,CAClB,wCAAQ,CACN,K
 AAK,CAAE,OAAmB,CAC5B,6CAAW,CACT,KAAK,ClB1OyB,OAAW,CkB2OzC,SAAS,CAAE,eAAe,CAE9B,oCAAK,CACH,aAAa,CAAE,GAAqB,CACpC,MAAM,CAAE,IAAI,CACZ,WAAW,CAAE,cAAuB,CACpC,UAAU,CAAE,OAAa,CACzB,KAAK,CpB7M2B,IAAwB,CoB8MxD,gDAAW,CACT,KAAK,ClBpPyB,OAAW,CkBqPzC,SAAS,CAAE,eAAe,CAC9B,6CAAc,CACZ,UAAU,CAAE,CAAC,CAEf,uGAAQ,CACN,WAAW,CAAE,IAAI,CACjB,oRAA2B,CACzB,gBAAgB,CAAE,WAAW,CAC7B,MAAM,CAAE,IAAI,CACZ,OAAO,CAAE,CAAC,CACV,SAAS,CAAE,eAAe,CAC5B,kIAAU,CACR,WAAW,CAAE,IAAI,CAErB,wCAAS,CACP,OAAO,CAAE,YAAY,CACrB,OAAO,CAAE,KAAK,CACd,KAAK,CpBlQ2B,IAAI,CoBmQpC,WAAW,CAAE,IAAI,CACnB,wCAAS,CACP,OAAO,CAAE,YAAY,CACrB,aAAa,CAAE,GAAG,CAEtB,uDAA8B,CAC5B,OAAO,CAAE,YAAY,CACrB,KAAK,CpB7M6B,OAAM,CoB8MxC,SAAS,CAAE,GAAG,CACd,YAAY,CpBtPsB,IAAI,CoBuPxC,2BAAc,CACZ,OAAO,CAAE,KAAK,CACd,KAAK,CAAE,KAAK,CACd,qBAAQ,CACN,aAAa,CAAE,IAAI,CACnB,WAAW,CAAE,IAAI,CAEnB,mDAAa,CACX,UAAU,CAAE,OAAO,CACnB,OAAO,CAAE,OAAO,CAChB,WAAW,CAAE,OAAO,CACpB,SAAS,CAAE,OAAO,CAClB,KAAK,CAAE,OAAO,CACd,MAAM,CAAE,OAAO,CACf,WAAW,CAAE,OAAO,CAIlB,mGAAQ,CACN,YAAY,CAAE,GAAG,C
 jB1QrB,oCAAsB,CiB+QtB,qBAAQ,CACN,KAAK,CAAE,IAAI,EChTjB,wBAAwB,CACtB,KAAK,CnBK+B,OAAW,CmBHjD,KAAK,CACH,UAAU,CAAE,MAAM,YCHlB,WAAW,CAAE,aAAa,CAC1B,UAAU,CAAE,MAAM,CAClB,WAAW,CAAE,GAAG,CAChB,GAAG,CAAE,qEAAoB,YAGzB,WAAW,CAAE,aAAa,CAC1B,UAAU,CAAE,MAAM,CAClB,WAAW,CAAE,GAAG,CAChB,GAAG,CAAE,yGAAyB,YAG9B,WAAW,CAAE,MAAM,CACnB,UAAU,CAAE,MAAM,CAClB,WAAW,CAAE,GAAG,CAChB,GAAG,CAAE,6FAAqB,YAG1B,WAAW,CAAE,MAAM,CACnB,UAAU,CAAE,MAAM,CAClB,WAAW,CAAE,GAAG,CAChB,GAAG,CAAE,oFAAkB,YAGvB,WAAW,CAAE,aAAa,CAC1B,UAAU,CAAE,MAAM,CAClB,WAAW,CAAE,GAAG,CAChB,GAAG,CAAE,gHAA4B,YAGjC,WAAW,CAAE,aAAa,CAC1B,UAAU,CAAE,MAAM,CAClB,WAAW,CAAE,GAAG,CAChB,GAAG,CAAE,uGAAyB",
+"sources": ["../../../bower_components/neat/app/assets/stylesheets/grid/_grid.scss","../../../bower_components/bourbon/dist/addons/_prefixer.scss","../../../bower_components/wyrm/sass/wyrm_core/_reset.sass","../../../bower_components/wyrm/sass/wyrm_core/_mixin.sass","../../../bower_components/font-awesome/scss/_path.scss","../../../bower_components/font-awesome/scss/_core.scss","../../../bower_components/font-awesome/scss/_larger.scss","../../../bower_components/font-awesome/scss/_fixed-width.scss","../../../bower_components/font-awesome/scss/_list.scss","../../../bower_components/font-awesome/scss/_variables.scss","../../../bower_components/font-awesome/scss/_bordered-pulled.scss","../../../bower_components/font-awesome/scss/_spinning.scss","../../../bower_components/font-awesome/scss/_rotated-flipped.scss","../../../bower_components/font-awesome/scss/_mixins.scss","../../../bower_components/font-awesome/scss/_stacked.scss","../../../bower_components/font-awesome/scss/_icons.scss",
 "../../../bower_components/wyrm/sass/wyrm_core/_font_icon_defaults.sass","../../../bower_components/wyrm/sass/wyrm_core/_wy_variables.sass","../../../bower_components/wyrm/sass/wyrm_core/_alert.sass","../../../sass/_theme_variables.sass","../../../bower_components/neat/app/assets/stylesheets/grid/_media.scss","../../../bower_components/wyrm/sass/wyrm_core/_button.sass","../../../bower_components/wyrm/sass/wyrm_core/_dropdown.sass","../../../bower_components/wyrm/sass/wyrm_core/_form.sass","../../../bower_components/neat/app/assets/stylesheets/grid/_outer-container.scss","../../../bower_components/neat/app/assets/stylesheets/settings/_grid.scss","../../../bower_components/neat/app/assets/stylesheets/grid/_span-columns.scss","../../../bower_components/wyrm/sass/wyrm_core/_neat_extra.sass","../../../bower_components/wyrm/sass/wyrm_core/_generic.sass","../../../bower_components/wyrm/sass/wyrm_core/_table.sass","../../../bower_components/wyrm/sass/wyrm_core/_type.sass","../../../bower_co
 mponents/wyrm/sass/wyrm_addons/pygments/_pygments.sass","../../../bower_components/wyrm/sass/wyrm_addons/pygments/_pygments_light.sass","../../../sass/_theme_breadcrumbs.sass","../../../sass/_theme_layout.sass","../../../bower_components/neat/app/assets/stylesheets/grid/_private.scss","../../../sass/_theme_badge.sass","../../../sass/_theme_rst.sass","../../../sass/_theme_mathjax.sass","../../../sass/_theme_font_local.sass"],
+"names": [],
+"file": "theme.css"
+}

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_static/doctools.js
----------------------------------------------------------------------
diff --git a/content/docs/_static/doctools.js b/content/docs/_static/doctools.js
new file mode 100644
index 0000000..c7bfe76
--- /dev/null
+++ b/content/docs/_static/doctools.js
@@ -0,0 +1,263 @@
+/*
+ * doctools.js
+ * ~~~~~~~~~~~
+ *
+ * Sphinx JavaScript utilities for all documentation.
+ *
+ * :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+ * :license: BSD, see LICENSE for details.
+ *
+ */
+
+/**
+ * select a different prefix for underscore
+ */
+$u = _.noConflict();
+
+/**
+ * make the code below compatible with browsers without
+ * an installed firebug like debugger
+if (!window.console || !console.firebug) {
+  var names = ["log", "debug", "info", "warn", "error", "assert", "dir",
+    "dirxml", "group", "groupEnd", "time", "timeEnd", "count", "trace",
+    "profile", "profileEnd"];
+  window.console = {};
+  for (var i = 0; i < names.length; ++i)
+    window.console[names[i]] = function() {};
+}
+ */
+
+/**
+ * small helper function to urldecode strings
+ */
+jQuery.urldecode = function(x) {
+  return decodeURIComponent(x).replace(/\+/g, ' ');
+};
+
+/**
+ * small helper function to urlencode strings
+ */
+jQuery.urlencode = encodeURIComponent;
+
+/**
+ * This function returns the parsed url parameters of the
+ * current request. Multiple values per key are supported,
+ * it will always return arrays of strings for the value parts.
+ */
+jQuery.getQueryParameters = function(s) {
+  if (typeof s == 'undefined')
+    s = document.location.search;
+  var parts = s.substr(s.indexOf('?') + 1).split('&');
+  var result = {};
+  for (var i = 0; i < parts.length; i++) {
+    var tmp = parts[i].split('=', 2);
+    var key = jQuery.urldecode(tmp[0]);
+    var value = jQuery.urldecode(tmp[1]);
+    if (key in result)
+      result[key].push(value);
+    else
+      result[key] = [value];
+  }
+  return result;
+};
+
+/**
+ * highlight a given string on a jquery object by wrapping it in
+ * span elements with the given class name.
+ */
+jQuery.fn.highlightText = function(text, className) {
+  function highlight(node) {
+    if (node.nodeType == 3) {
+      var val = node.nodeValue;
+      var pos = val.toLowerCase().indexOf(text);
+      if (pos >= 0 && !jQuery(node.parentNode).hasClass(className)) {
+        var span = document.createElement("span");
+        span.className = className;
+        span.appendChild(document.createTextNode(val.substr(pos, text.length)));
+        node.parentNode.insertBefore(span, node.parentNode.insertBefore(
+          document.createTextNode(val.substr(pos + text.length)),
+          node.nextSibling));
+        node.nodeValue = val.substr(0, pos);
+      }
+    }
+    else if (!jQuery(node).is("button, select, textarea")) {
+      jQuery.each(node.childNodes, function() {
+        highlight(this);
+      });
+    }
+  }
+  return this.each(function() {
+    highlight(this);
+  });
+};
+
+/*
+ * backward compatibility for jQuery.browser
+ * This will be supported until firefox bug is fixed.
+ */
+if (!jQuery.browser) {
+  jQuery.uaMatch = function(ua) {
+    ua = ua.toLowerCase();
+
+    var match = /(chrome)[ \/]([\w.]+)/.exec(ua) ||
+      /(webkit)[ \/]([\w.]+)/.exec(ua) ||
+      /(opera)(?:.*version|)[ \/]([\w.]+)/.exec(ua) ||
+      /(msie) ([\w.]+)/.exec(ua) ||
+      ua.indexOf("compatible") < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec(ua) ||
+      [];
+
+    return {
+      browser: match[ 1 ] || "",
+      version: match[ 2 ] || "0"
+    };
+  };
+  jQuery.browser = {};
+  jQuery.browser[jQuery.uaMatch(navigator.userAgent).browser] = true;
+}
+
+/**
+ * Small JavaScript module for the documentation.
+ */
+var Documentation = {
+
+  init : function() {
+    this.fixFirefoxAnchorBug();
+    this.highlightSearchWords();
+    this.initIndexTable();
+  },
+
+  /**
+   * i18n support
+   */
+  TRANSLATIONS : {},
+  PLURAL_EXPR : function(n) { return n == 1 ? 0 : 1; },
+  LOCALE : 'unknown',
+
+  // gettext and ngettext don't access this so that the functions
+  // can safely bound to a different name (_ = Documentation.gettext)
+  gettext : function(string) {
+    var translated = Documentation.TRANSLATIONS[string];
+    if (typeof translated == 'undefined')
+      return string;
+    return (typeof translated == 'string') ? translated : translated[0];
+  },
+
+  ngettext : function(singular, plural, n) {
+    var translated = Documentation.TRANSLATIONS[singular];
+    if (typeof translated == 'undefined')
+      return (n == 1) ? singular : plural;
+    return translated[Documentation.PLURALEXPR(n)];
+  },
+
+  addTranslations : function(catalog) {
+    for (var key in catalog.messages)
+      this.TRANSLATIONS[key] = catalog.messages[key];
+    this.PLURAL_EXPR = new Function('n', 'return +(' + catalog.plural_expr + ')');
+    this.LOCALE = catalog.locale;
+  },
+
+  /**
+   * add context elements like header anchor links
+   */
+  addContextElements : function() {
+    $('div[id] > :header:first').each(function() {
+      $('<a class="headerlink">\u00B6</a>').
+      attr('href', '#' + this.id).
+      attr('title', _('Permalink to this headline')).
+      appendTo(this);
+    });
+    $('dt[id]').each(function() {
+      $('<a class="headerlink">\u00B6</a>').
+      attr('href', '#' + this.id).
+      attr('title', _('Permalink to this definition')).
+      appendTo(this);
+    });
+  },
+
+  /**
+   * workaround a firefox stupidity
+   * see: https://bugzilla.mozilla.org/show_bug.cgi?id=645075
+   */
+  fixFirefoxAnchorBug : function() {
+    if (document.location.hash)
+      window.setTimeout(function() {
+        document.location.href += '';
+      }, 10);
+  },
+
+  /**
+   * highlight the search words provided in the url in the text
+   */
+  highlightSearchWords : function() {
+    var params = $.getQueryParameters();
+    var terms = (params.highlight) ? params.highlight[0].split(/\s+/) : [];
+    if (terms.length) {
+      var body = $('div.body');
+      if (!body.length) {
+        body = $('body');
+      }
+      window.setTimeout(function() {
+        $.each(terms, function() {
+          body.highlightText(this.toLowerCase(), 'highlighted');
+        });
+      }, 10);
+      $('<p class="highlight-link"><a href="javascript:Documentation.' +
+        'hideSearchWords()">' + _('Hide Search Matches') + '</a></p>')
+          .appendTo($('#searchbox'));
+    }
+  },
+
+  /**
+   * init the domain index toggle buttons
+   */
+  initIndexTable : function() {
+    var togglers = $('img.toggler').click(function() {
+      var src = $(this).attr('src');
+      var idnum = $(this).attr('id').substr(7);
+      $('tr.cg-' + idnum).toggle();
+      if (src.substr(-9) == 'minus.png')
+        $(this).attr('src', src.substr(0, src.length-9) + 'plus.png');
+      else
+        $(this).attr('src', src.substr(0, src.length-8) + 'minus.png');
+    }).css('display', '');
+    if (DOCUMENTATION_OPTIONS.COLLAPSE_INDEX) {
+        togglers.click();
+    }
+  },
+
+  /**
+   * helper function to hide the search marks again
+   */
+  hideSearchWords : function() {
+    $('#searchbox .highlight-link').fadeOut(300);
+    $('span.highlighted').removeClass('highlighted');
+  },
+
+  /**
+   * make the url absolute
+   */
+  makeURL : function(relativeURL) {
+    return DOCUMENTATION_OPTIONS.URL_ROOT + '/' + relativeURL;
+  },
+
+  /**
+   * get the current relative url
+   */
+  getCurrentURL : function() {
+    var path = document.location.pathname;
+    var parts = path.split(/\//);
+    $.each(DOCUMENTATION_OPTIONS.URL_ROOT.split(/\//), function() {
+      if (this == '..')
+        parts.pop();
+    });
+    var url = parts.join('/');
+    return path.substring(url.lastIndexOf('/') + 1, path.length - 1);
+  }
+};
+
+// quick alias for translations
+_ = Documentation.gettext;
+
+$(document).ready(function() {
+  Documentation.init();
+});

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_static/down-pressed.png
----------------------------------------------------------------------
diff --git a/content/docs/_static/down-pressed.png b/content/docs/_static/down-pressed.png
new file mode 100644
index 0000000..7c30d00
Binary files /dev/null and b/content/docs/_static/down-pressed.png differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_static/down.png
----------------------------------------------------------------------
diff --git a/content/docs/_static/down.png b/content/docs/_static/down.png
new file mode 100644
index 0000000..f48098a
Binary files /dev/null and b/content/docs/_static/down.png differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_static/file.png
----------------------------------------------------------------------
diff --git a/content/docs/_static/file.png b/content/docs/_static/file.png
new file mode 100644
index 0000000..254c60b
Binary files /dev/null and b/content/docs/_static/file.png differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_static/fonts/FontAwesome.otf
----------------------------------------------------------------------
diff --git a/content/docs/_static/fonts/FontAwesome.otf b/content/docs/_static/fonts/FontAwesome.otf
new file mode 100644
index 0000000..8b0f54e
Binary files /dev/null and b/content/docs/_static/fonts/FontAwesome.otf differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_static/fonts/Inconsolata-Bold.ttf
----------------------------------------------------------------------
diff --git a/content/docs/_static/fonts/Inconsolata-Bold.ttf b/content/docs/_static/fonts/Inconsolata-Bold.ttf
new file mode 100644
index 0000000..360a232
Binary files /dev/null and b/content/docs/_static/fonts/Inconsolata-Bold.ttf differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_static/fonts/Inconsolata.ttf
----------------------------------------------------------------------
diff --git a/content/docs/_static/fonts/Inconsolata.ttf b/content/docs/_static/fonts/Inconsolata.ttf
new file mode 100644
index 0000000..4b8a36d
Binary files /dev/null and b/content/docs/_static/fonts/Inconsolata.ttf differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_static/fonts/Lato-Bold.ttf
----------------------------------------------------------------------
diff --git a/content/docs/_static/fonts/Lato-Bold.ttf b/content/docs/_static/fonts/Lato-Bold.ttf
new file mode 100644
index 0000000..e8b9bf6
Binary files /dev/null and b/content/docs/_static/fonts/Lato-Bold.ttf differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_static/fonts/Lato-Regular.ttf
----------------------------------------------------------------------
diff --git a/content/docs/_static/fonts/Lato-Regular.ttf b/content/docs/_static/fonts/Lato-Regular.ttf
new file mode 100644
index 0000000..7608bc3
Binary files /dev/null and b/content/docs/_static/fonts/Lato-Regular.ttf differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_static/fonts/RobotoSlab-Bold.ttf
----------------------------------------------------------------------
diff --git a/content/docs/_static/fonts/RobotoSlab-Bold.ttf b/content/docs/_static/fonts/RobotoSlab-Bold.ttf
new file mode 100644
index 0000000..e6ed0de
Binary files /dev/null and b/content/docs/_static/fonts/RobotoSlab-Bold.ttf differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_static/fonts/RobotoSlab-Regular.ttf
----------------------------------------------------------------------
diff --git a/content/docs/_static/fonts/RobotoSlab-Regular.ttf b/content/docs/_static/fonts/RobotoSlab-Regular.ttf
new file mode 100644
index 0000000..141d6c0
Binary files /dev/null and b/content/docs/_static/fonts/RobotoSlab-Regular.ttf differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_static/fonts/fontawesome-webfont.eot
----------------------------------------------------------------------
diff --git a/content/docs/_static/fonts/fontawesome-webfont.eot b/content/docs/_static/fonts/fontawesome-webfont.eot
new file mode 100644
index 0000000..7c79c6a
Binary files /dev/null and b/content/docs/_static/fonts/fontawesome-webfont.eot differ

[40/60] [abbrv] incubator-usergrid git commit: For review purposes.

[sn...@apache.org]

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/24aa4da8/docs/rest-endpoints/api-docs.html
----------------------------------------------------------------------
diff --git a/docs/rest-endpoints/api-docs.html b/docs/rest-endpoints/api-docs.html
deleted file mode 100644
index 1241a65..0000000
--- a/docs/rest-endpoints/api-docs.html
+++ /dev/null
@@ -1,5867 +0,0 @@
-<html>
-<head>
-    <title>Usergrid API Reference</title>
-    
-    <!-- Latest compiled and minified CSS -->
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css">
-    
-    <!-- Optional theme -->
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap-theme.min.css">
-
-    <link rel="stylesheet" href="api-docs.css">
-    
-</head>
-<body>
-
-<div class="row">
-    <div class="col-md-1"></div>
-    <div class="col-md-10">
-    
-    <h1>Usergrid API Reference</h1>
-    <p>Generated from Swagger.</p>
-<h2>Methods</h2><p>API methods are organized by the tags.</p>
-<p>Following the methods is a listing of all <a href='#models'>Default Entity Models.</p>
-<a name='Action-method'></a>
-<h2>Action Methods</h2>
-
-<div class="panel panel-default">
-    
-    <div class="panel-heading GET">
-        <h2 class="panel-title GET-heading">GET /management/orgs/{orgId}/activate 
-            <a data-toggle="collapse" data-target="#collapse-iN5h4Rfha6"
-                href="#collapse-iN5h4Rfha6" class="collapsed collapse-button"> </a>
-        </h2>
-    </div>
-    
-    <div id="collapse-iN5h4Rfha6" class="panel-body collapse">
-
-        <p>Activate an organization from a link provIded in an email notification.</p>
-
-        <h3>Parameters</h3>
-
-        <ul>
-                <li>
-                    <b>orgId</b> (string) <br>
-                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>token</b> () <br>
-                    Activation token. (Specified in query).
-                </li>
-                <li>
-                    <b>confirm_email</b> () <br>
-                    Send confirmation email or not. (Specified in query).
-                </li>
-        </ul>
-
-        <h3>Responses</h3>
-
-        <ul>
-                <li>
-                    <b>200</b>
-                    <ul>
-                        <li>Description: An array of complete messages.</li>
-                        <li>Schema: [<a href="#action">Action</a>]</li>
-                    </ul>
-                </li>
-                <li>
-                    <b>default</b>
-                    <ul>
-                        <li>Description: Unexpected error.</li>
-                        <li>Schema: [<a href="#error">Error</a>]</li>
-                    </ul>
-                </li>
-        </ul>     
-        
-    </div>
-    <!--<div class="panel-footer"></div>-->
-</div>
-
-<div class="panel panel-default">
-    
-    <div class="panel-heading GET">
-        <h2 class="panel-title GET-heading">GET /management/orgs/{orgId}/reactivate 
-            <a data-toggle="collapse" data-target="#collapse-4JPBNBUnYR"
-                href="#collapse-4JPBNBUnYR" class="collapsed collapse-button"> </a>
-        </h2>
-    </div>
-    
-    <div id="collapse-4JPBNBUnYR" class="panel-body collapse">
-
-        <p>Reactivate an expired organization.</p>
-
-        <h3>Parameters</h3>
-
-        <ul>
-                <li>
-                    <b>orgId</b> (string) <br>
-                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-        </ul>
-
-        <h3>Responses</h3>
-
-        <ul>
-                <li>
-                    <b>200</b>
-                    <ul>
-                        <li>Description: An array of complete messages.</li>
-                        <li>Schema: [<a href="#action">Action</a>]</li>
-                    </ul>
-                </li>
-                <li>
-                    <b>default</b>
-                    <ul>
-                        <li>Description: Unexpected error.</li>
-                        <li>Schema: [<a href="#error">Error</a>]</li>
-                    </ul>
-                </li>
-        </ul>     
-        
-    </div>
-    <!--<div class="panel-footer"></div>-->
-</div>
-
-<div class="panel panel-default">
-    
-    <div class="panel-heading GET">
-        <h2 class="panel-title GET-heading">GET /management/users/resetpw 
-            <a data-toggle="collapse" data-target="#collapse-8Q4qhiQLvH"
-                href="#collapse-8Q4qhiQLvH" class="collapsed collapse-button"> </a>
-        </h2>
-    </div>
-    
-    <div id="collapse-8Q4qhiQLvH" class="panel-body collapse">
-
-        <p>Initiate the reset of an admin user&#39;s password.</p>
-
-        <h3>Parameters</h3>
-
-        <ul>
-        </ul>
-
-        <h3>Responses</h3>
-
-        <ul>
-                <li>
-                    <b>200</b>
-                    <ul>
-                        <li>Description: An array of complete messages.</li>
-                        <li>Schema: [<a href="#action">Action</a>]</li>
-                    </ul>
-                </li>
-                <li>
-                    <b>default</b>
-                    <ul>
-                        <li>Description: Unexpected error.</li>
-                        <li>Schema: [<a href="#error">Error</a>]</li>
-                    </ul>
-                </li>
-        </ul>     
-        
-    </div>
-    <!--<div class="panel-footer"></div>-->
-</div>
-
-<div class="panel panel-default">
-    
-    <div class="panel-heading POST">
-        <h2 class="panel-title POST-heading">POST /management/users/resetpw 
-            <a data-toggle="collapse" data-target="#collapse-TBw5HyJTTa"
-                href="#collapse-TBw5HyJTTa" class="collapsed collapse-button"> </a>
-        </h2>
-    </div>
-    
-    <div id="collapse-TBw5HyJTTa" class="panel-body collapse">
-
-        <p>Complete the password reset through getting the newpassword and the old one for identification.</p>
-
-        <h3>Parameters</h3>
-
-        <ul>
-                <li>
-                    <b>ResetPWMsg</b> (                    <a href="#resetpwmsg">ResetPWMsg</a>) <br>
-                    Parameters and value for the Captcha challenge, the admin user&#39;s response to the Captcha challenge, and the admin user&#39;s email address. (Specified in body).
-                </li>
-        </ul>
-
-        <h3>Responses</h3>
-
-        <ul>
-                <li>
-                    <b>200</b>
-                    <ul>
-                        <li>Description: An array of complete messages.</li>
-                        <li>Schema: [<a href="#action">Action</a>]</li>
-                    </ul>
-                </li>
-                <li>
-                    <b>default</b>
-                    <ul>
-                        <li>Description: Unexpected error.</li>
-                        <li>Schema: [<a href="#error">Error</a>]</li>
-                    </ul>
-                </li>
-        </ul>     
-        
-    </div>
-    <!--<div class="panel-footer"></div>-->
-</div>
-
-<div class="panel panel-default">
-    
-    <div class="panel-heading GET">
-        <h2 class="panel-title GET-heading">GET /management/users/{userId}/activate 
-            <a data-toggle="collapse" data-target="#collapse-gPyb4FcquB"
-                href="#collapse-gPyb4FcquB" class="collapsed collapse-button"> </a>
-        </h2>
-    </div>
-    
-    <div id="collapse-gPyb4FcquB" class="panel-body collapse">
-
-        <p>Activate an admin user from a link provIded in an email notification.</p>
-
-        <h3>Parameters</h3>
-
-        <ul>
-                <li>
-                    <b>userId</b> (string) <br>
-                    One of the user&#39;s identification which includes username, real name, email address or UUID. (Specified in path).
-                </li>
-                <li>
-                    <b>token</b> () <br>
-                    Activation token&#39;s query statement. (Specified in query).
-                </li>
-                <li>
-                    <b>confirm_email</b> () <br>
-                    Query statement of whether send confimation email or not. (Specified in query).
-                </li>
-        </ul>
-
-        <h3>Responses</h3>
-
-        <ul>
-                <li>
-                    <b>200</b>
-                    <ul>
-                        <li>Description: An array of complete messages.</li>
-                        <li>Schema: [<a href="#action">Action</a>]</li>
-                    </ul>
-                </li>
-                <li>
-                    <b>default</b>
-                    <ul>
-                        <li>Description: Unexpected error.</li>
-                        <li>Schema: [<a href="#error">Error</a>]</li>
-                    </ul>
-                </li>
-        </ul>     
-        
-    </div>
-    <!--<div class="panel-footer"></div>-->
-</div>
-
-<div class="panel panel-default">
-    
-    <div class="panel-heading PUT">
-        <h2 class="panel-title PUT-heading">PUT /management/users/{userId}/password 
-            <a data-toggle="collapse" data-target="#collapse-eOkQcznynD"
-                href="#collapse-eOkQcznynD" class="collapsed collapse-button"> </a>
-        </h2>
-    </div>
-    
-    <div id="collapse-eOkQcznynD" class="panel-body collapse">
-
-        <p>Update an admin user&#39;s password through getting the newpassword and the old one for identification.</p>
-
-        <h3>Parameters</h3>
-
-        <ul>
-                <li>
-                    <b>userId</b> (string) <br>
-                    One of the user&#39;s identification which includes username, real name, email address or UUID. (Specified in path).
-                </li>
-                <li>
-                    <b>ResetPW</b> (                    <a href="#resetpw">ResetPW</a>) <br>
-                    The user&#39;s old and new password. (Specified in body).
-                </li>
-        </ul>
-
-        <h3>Responses</h3>
-
-        <ul>
-                <li>
-                    <b>200</b>
-                    <ul>
-                        <li>Description: An array of complete messages.</li>
-                        <li>Schema: [<a href="#action">Action</a>]</li>
-                    </ul>
-                </li>
-                <li>
-                    <b>default</b>
-                    <ul>
-                        <li>Description: Unexpected error.</li>
-                        <li>Schema: [<a href="#error">Error</a>]</li>
-                    </ul>
-                </li>
-        </ul>     
-        
-    </div>
-    <!--<div class="panel-footer"></div>-->
-</div>
-
-<div class="panel panel-default">
-    
-    <div class="panel-heading GET">
-        <h2 class="panel-title GET-heading">GET /management/users/{userId}/reactivate 
-            <a data-toggle="collapse" data-target="#collapse-pxE50B5nCD"
-                href="#collapse-pxE50B5nCD" class="collapsed collapse-button"> </a>
-        </h2>
-    </div>
-    
-    <div id="collapse-pxE50B5nCD" class="panel-body collapse">
-
-        <p>Reactivate an expired admin user.</p>
-
-        <h3>Parameters</h3>
-
-        <ul>
-                <li>
-                    <b>userId</b> (string) <br>
-                    One of the user&#39;s identification which includes username, real name, email address or UUID. (Specified in path).
-                </li>
-        </ul>
-
-        <h3>Responses</h3>
-
-        <ul>
-                <li>
-                    <b>200</b>
-                    <ul>
-                        <li>Description: An array of complete messages.</li>
-                        <li>Schema: [<a href="#action">Action</a>]</li>
-                    </ul>
-                </li>
-                <li>
-                    <b>default</b>
-                    <ul>
-                        <li>Description: Unexpected error.</li>
-                        <li>Schema: [<a href="#error">Error</a>]</li>
-                    </ul>
-                </li>
-        </ul>     
-        
-    </div>
-    <!--<div class="panel-footer"></div>-->
-</div>
-
-<div class="panel panel-default">
-    
-    <div class="panel-heading POST">
-        <h2 class="panel-title POST-heading">POST /{orgId}/{appId}/users/{user}/password 
-            <a data-toggle="collapse" data-target="#collapse-sOcj4VS4JA"
-                href="#collapse-sOcj4VS4JA" class="collapsed collapse-button"> </a>
-        </h2>
-    </div>
-    
-    <div id="collapse-sOcj4VS4JA" class="panel-body collapse">
-
-        <p>Set a user&#39;s password or reset the user&#39;s existing password.</p>
-
-        <h3>Parameters</h3>
-
-        <ul>
-                <li>
-                    <b>orgId</b> (string) <br>
-                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>appId</b> (string) <br>
-                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>username</b> (string) <br>
-                    The username of the user. (Specified in path).
-                </li>
-                <li>
-                    <b>ResetPW</b> (                    <a href="#resetpw">ResetPW</a>) <br>
-                    The user&#39;s old and new password. (Specified in body).
-                </li>
-        </ul>
-
-        <h3>Responses</h3>
-
-        <ul>
-                <li>
-                    <b>200</b>
-                    <ul>
-                        <li>Description: An array of complete messages.</li>
-                        <li>Schema: [<a href="#action">Action</a>]</li>
-                    </ul>
-                </li>
-                <li>
-                    <b>default</b>
-                    <ul>
-                        <li>Description: Unexpected error.</li>
-                        <li>Schema: [<a href="#error">Error</a>]</li>
-                    </ul>
-                </li>
-        </ul>     
-        
-    </div>
-    <!--<div class="panel-footer"></div>-->
-</div>
-<a name='ActivityFeed-method'></a>
-<h2>ActivityFeed Methods</h2>
-
-<div class="panel panel-default">
-    
-    <div class="panel-heading GET">
-        <h2 class="panel-title GET-heading">GET /management/orgs/{orgId}/feed 
-            <a data-toggle="collapse" data-target="#collapse-HkB3lyybM0"
-                href="#collapse-HkB3lyybM0" class="collapsed collapse-button"> </a>
-        </h2>
-    </div>
-    
-    <div id="collapse-HkB3lyybM0" class="panel-body collapse">
-
-        <p>Retrieve an organization&#39;s activity feed.</p>
-
-        <h3>Parameters</h3>
-
-        <ul>
-                <li>
-                    <b>orgId</b> (string) <br>
-                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-        </ul>
-
-        <h3>Responses</h3>
-
-        <ul>
-                <li>
-                    <b>200</b>
-                    <ul>
-                        <li>Description: An array of the organization&#39;s ActivityFeed.</li>
-                        <li>Schema: [<a href="#activityfeed">ActivityFeed</a>]</li>
-                    </ul>
-                </li>
-                <li>
-                    <b>default</b>
-                    <ul>
-                        <li>Description: Unexpected error.</li>
-                        <li>Schema: [<a href="#error">Error</a>]</li>
-                    </ul>
-                </li>
-        </ul>     
-        
-    </div>
-    <!--<div class="panel-footer"></div>-->
-</div>
-
-<div class="panel panel-default">
-    
-    <div class="panel-heading GET">
-        <h2 class="panel-title GET-heading">GET /management/users/{userId}/feed 
-            <a data-toggle="collapse" data-target="#collapse-trV5SjBRiv"
-                href="#collapse-trV5SjBRiv" class="collapsed collapse-button"> </a>
-        </h2>
-    </div>
-    
-    <div id="collapse-trV5SjBRiv" class="panel-body collapse">
-
-        <p>Retrieve an admin user&#39;s activity feed.</p>
-
-        <h3>Parameters</h3>
-
-        <ul>
-                <li>
-                    <b>userId</b> (string) <br>
-                    One of the user&#39;s identification which includes username, real name, email address or UUID. (Specified in path).
-                </li>
-        </ul>
-
-        <h3>Responses</h3>
-
-        <ul>
-                <li>
-                    <b>200</b>
-                    <ul>
-                        <li>Description: An array of user&#39;s activity</li>
-                        <li>Schema: [<a href="#activityfeed">ActivityFeed</a>]</li>
-                    </ul>
-                </li>
-                <li>
-                    <b>default</b>
-                    <ul>
-                        <li>Description: Unexpected error.</li>
-                        <li>Schema: [<a href="#error">Error</a>]</li>
-                    </ul>
-                </li>
-        </ul>     
-        
-    </div>
-    <!--<div class="panel-footer"></div>-->
-</div>
-
-<div class="panel panel-default">
-    
-    <div class="panel-heading POST">
-        <h2 class="panel-title POST-heading">POST /{orgId}/{appId}/groups/{groupId}/activities 
-            <a data-toggle="collapse" data-target="#collapse-zj0yM6YokI"
-                href="#collapse-zj0yM6YokI" class="collapsed collapse-button"> </a>
-        </h2>
-    </div>
-    
-    <div id="collapse-zj0yM6YokI" class="panel-body collapse">
-
-        <p>Create an activity to a specific group. In this case the activity is created in the activities collection and is accessible at the /activities endpoint to users who have the permission to read that endpoint. In addition, a relationship is established between the activity and the group, and because of that, the activity will appear in the group’s feed. The group &#39;owns&#39; the activity. Also, the activity will be published in the feed of all users that are members of the group.</p>
-
-        <h3>Parameters</h3>
-
-        <ul>
-                <li>
-                    <b>orgId</b> (string) <br>
-                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>appId</b> (string) <br>
-                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>groupId</b> (string) <br>
-                    One of the group&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>CreateActivity</b> (                    <a href="#createactivity">CreateActivity</a>) <br>
-                    One or more sets of activity properties. (Specified in body).
-                </li>
-        </ul>
-
-        <h3>Responses</h3>
-
-        <ul>
-                <li>
-                    <b>200</b>
-                    <ul>
-                        <li>Description: An array of user&#39;s activity.</li>
-                        <li>Schema: [<a href="#activityfeed">ActivityFeed</a>]</li>
-                    </ul>
-                </li>
-                <li>
-                    <b>default</b>
-                    <ul>
-                        <li>Description: Unexpected error.</li>
-                        <li>Schema: [<a href="#error">Error</a>]</li>
-                    </ul>
-                </li>
-        </ul>     
-        
-    </div>
-    <!--<div class="panel-footer"></div>-->
-</div>
-
-<div class="panel panel-default">
-    
-    <div class="panel-heading GET">
-        <h2 class="panel-title GET-heading">GET /{orgId}/{appId}/groups/{groupId}/feed 
-            <a data-toggle="collapse" data-target="#collapse-gIeQmdnsDx"
-                href="#collapse-gIeQmdnsDx" class="collapsed collapse-button"> </a>
-        </h2>
-    </div>
-    
-    <div id="collapse-gIeQmdnsDx" class="panel-body collapse">
-
-        <p>Get a group&#39;s feed through providing all the identifications.</p>
-
-        <h3>Parameters</h3>
-
-        <ul>
-                <li>
-                    <b>orgId</b> (string) <br>
-                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>appId</b> (string) <br>
-                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>groupId</b> (string) <br>
-                    One of the group&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-        </ul>
-
-        <h3>Responses</h3>
-
-        <ul>
-                <li>
-                    <b>200</b>
-                    <ul>
-                        <li>Description: An array of group&#39;s activity.</li>
-                        <li>Schema: [<a href="#activityfeed">ActivityFeed</a>]</li>
-                    </ul>
-                </li>
-                <li>
-                    <b>default</b>
-                    <ul>
-                        <li>Description: Unexpected error.</li>
-                        <li>Schema: [<a href="#error">Error</a>]</li>
-                    </ul>
-                </li>
-        </ul>     
-        
-    </div>
-    <!--<div class="panel-footer"></div>-->
-</div>
-
-<div class="panel panel-default">
-    
-    <div class="panel-heading POST">
-        <h2 class="panel-title POST-heading">POST /{orgId}/{appId}/users/{userId}/activities 
-            <a data-toggle="collapse" data-target="#collapse-L2T56Ztybh"
-                href="#collapse-L2T56Ztybh" class="collapsed collapse-button"> </a>
-        </h2>
-    </div>
-    
-    <div id="collapse-L2T56Ztybh" class="panel-body collapse">
-
-        <p>Create an activity in the activities collection.</p>
-
-        <h3>Parameters</h3>
-
-        <ul>
-                <li>
-                    <b>orgId</b> (string) <br>
-                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>appId</b> (string) <br>
-                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>userId-3</b> (string) <br>
-                    One of the user&#39;s identification which includes username or UUID. (Specified in path).
-                </li>
-                <li>
-                    <b>CreateActivity</b> (                    <a href="#createactivity">CreateActivity</a>) <br>
-                    One or more sets of activity properties. (Specified in body).
-                </li>
-        </ul>
-
-        <h3>Responses</h3>
-
-        <ul>
-                <li>
-                    <b>200</b>
-                    <ul>
-                        <li>Description: An array of user&#39;s activity.</li>
-                        <li>Schema: [<a href="#activityfeed">ActivityFeed</a>]</li>
-                    </ul>
-                </li>
-                <li>
-                    <b>default</b>
-                    <ul>
-                        <li>Description: Unexpected error.</li>
-                        <li>Schema: [<a href="#error">Error</a>]</li>
-                    </ul>
-                </li>
-        </ul>     
-        
-    </div>
-    <!--<div class="panel-footer"></div>-->
-</div>
-
-<div class="panel panel-default">
-    
-    <div class="panel-heading GET">
-        <h2 class="panel-title GET-heading">GET /{orgId}/{appId}/users/{userId}/feed 
-            <a data-toggle="collapse" data-target="#collapse-q3sk3xVUu4"
-                href="#collapse-q3sk3xVUu4" class="collapsed collapse-button"> </a>
-        </h2>
-    </div>
-    
-    <div id="collapse-q3sk3xVUu4" class="panel-body collapse">
-
-        <p>Retrieve a user&#39;s feed through providing all the identifications.</p>
-
-        <h3>Parameters</h3>
-
-        <ul>
-                <li>
-                    <b>orgId</b> (string) <br>
-                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>appId</b> (string) <br>
-                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>userId-3</b> (string) <br>
-                    One of the user&#39;s identification which includes username or UUID. (Specified in path).
-                </li>
-        </ul>
-
-        <h3>Responses</h3>
-
-        <ul>
-                <li>
-                    <b>200</b>
-                    <ul>
-                        <li>Description: An array of user&#39;s activity feed.</li>
-                        <li>Schema: [<a href="#activityfeed">ActivityFeed</a>]</li>
-                    </ul>
-                </li>
-                <li>
-                    <b>default</b>
-                    <ul>
-                        <li>Description: Unexpected error.</li>
-                        <li>Schema: [<a href="#error">Error</a>]</li>
-                    </ul>
-                </li>
-        </ul>     
-        
-    </div>
-    <!--<div class="panel-footer"></div>-->
-</div>
-<a name='AppData-method'></a>
-<h2>AppData Methods</h2>
-
-<div class="panel panel-default">
-    
-    <div class="panel-heading GET">
-        <h2 class="panel-title GET-heading">GET /management/orgs/{orgId}/apps 
-            <a data-toggle="collapse" data-target="#collapse-2aQqcShABU"
-                href="#collapse-2aQqcShABU" class="collapsed collapse-button"> </a>
-        </h2>
-    </div>
-    
-    <div id="collapse-2aQqcShABU" class="panel-body collapse">
-
-        <p>Retrieve the applications in an organization through providing both Id of application and organization.</p>
-
-        <h3>Parameters</h3>
-
-        <ul>
-                <li>
-                    <b>orgId</b> (string) <br>
-                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-        </ul>
-
-        <h3>Responses</h3>
-
-        <ul>
-                <li>
-                    <b>200</b>
-                    <ul>
-                        <li>Description: An array of retrieved application data.</li>
-                        <li>Schema: [<a href="#appdata">AppData</a>]</li>
-                    </ul>
-                </li>
-                <li>
-                    <b>default</b>
-                    <ul>
-                        <li>Description: Unexpected error.</li>
-                        <li>Schema: [<a href="#error">Error</a>]</li>
-                    </ul>
-                </li>
-        </ul>     
-        
-    </div>
-    <!--<div class="panel-footer"></div>-->
-</div>
-
-<div class="panel panel-default">
-    
-    <div class="panel-heading DELETE">
-        <h2 class="panel-title DELETE-heading">DELETE /management/orgs/{orgId}/apps/{appId} 
-            <a data-toggle="collapse" data-target="#collapse-G319AhhnWy"
-                href="#collapse-G319AhhnWy" class="collapsed collapse-button"> </a>
-        </h2>
-    </div>
-    
-    <div id="collapse-G319AhhnWy" class="panel-body collapse">
-
-        <p>Remove an application from an organization through providing both Id of application and organization.</p>
-
-        <h3>Parameters</h3>
-
-        <ul>
-                <li>
-                    <b>orgId</b> (string) <br>
-                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>appId</b> (string) <br>
-                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-        </ul>
-
-        <h3>Responses</h3>
-
-        <ul>
-                <li>
-                    <b>200</b>
-                    <ul>
-                        <li>Description: An array of deleted application info.</li>
-                        <li>Schema: [<a href="#appdata">AppData</a>]</li>
-                    </ul>
-                </li>
-                <li>
-                    <b>default</b>
-                    <ul>
-                        <li>Description: Unexpected error.</li>
-                        <li>Schema: [<a href="#error">Error</a>]</li>
-                    </ul>
-                </li>
-        </ul>     
-        
-    </div>
-    <!--<div class="panel-footer"></div>-->
-</div>
-<a name='Credential-method'></a>
-<h2>Credential Methods</h2>
-
-<div class="panel panel-default">
-    
-    <div class="panel-heading GET">
-        <h2 class="panel-title GET-heading">GET /management/orgs/{orgId}/apps/{appId}/credentials 
-            <a data-toggle="collapse" data-target="#collapse-AASgKtaSkG"
-                href="#collapse-AASgKtaSkG" class="collapsed collapse-button"> </a>
-        </h2>
-    </div>
-    
-    <div id="collapse-AASgKtaSkG" class="panel-body collapse">
-
-        <p>Retrieve the client Id and client secret credentials for an application in an organization.</p>
-
-        <h3>Parameters</h3>
-
-        <ul>
-                <li>
-                    <b>orgId</b> (string) <br>
-                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>appId</b> (string) <br>
-                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-        </ul>
-
-        <h3>Responses</h3>
-
-        <ul>
-                <li>
-                    <b>200</b>
-                    <ul>
-                        <li>Description: An array of retrieved credentials info.</li>
-                        <li>Schema: [<a href="#credential">Credential</a>]</li>
-                    </ul>
-                </li>
-                <li>
-                    <b>default</b>
-                    <ul>
-                        <li>Description: Unexpected error.</li>
-                        <li>Schema: [<a href="#error">Error</a>]</li>
-                    </ul>
-                </li>
-        </ul>     
-        
-    </div>
-    <!--<div class="panel-footer"></div>-->
-</div>
-
-<div class="panel panel-default">
-    
-    <div class="panel-heading POST">
-        <h2 class="panel-title POST-heading">POST /management/orgs/{orgId}/apps/{appId}/credentials 
-            <a data-toggle="collapse" data-target="#collapse-dKcFwuUjzH"
-                href="#collapse-dKcFwuUjzH" class="collapsed collapse-button"> </a>
-        </h2>
-    </div>
-    
-    <div id="collapse-dKcFwuUjzH" class="panel-body collapse">
-
-        <p>Generate the client Id and client secret credentials for an application in an organization.</p>
-
-        <h3>Parameters</h3>
-
-        <ul>
-                <li>
-                    <b>orgId</b> (string) <br>
-                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>appId</b> (string) <br>
-                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-        </ul>
-
-        <h3>Responses</h3>
-
-        <ul>
-                <li>
-                    <b>200</b>
-                    <ul>
-                        <li>Description: An array of generated credentials info.</li>
-                        <li>Schema: [<a href="#credential">Credential</a>]</li>
-                    </ul>
-                </li>
-                <li>
-                    <b>default</b>
-                    <ul>
-                        <li>Description: Unexpected error.</li>
-                        <li>Schema: [<a href="#error">Error</a>]</li>
-                    </ul>
-                </li>
-        </ul>     
-        
-    </div>
-    <!--<div class="panel-footer"></div>-->
-</div>
-
-<div class="panel panel-default">
-    
-    <div class="panel-heading GET">
-        <h2 class="panel-title GET-heading">GET /management/orgs/{orgId}/credentials 
-            <a data-toggle="collapse" data-target="#collapse-ZMqkJ1AwIr"
-                href="#collapse-ZMqkJ1AwIr" class="collapsed collapse-button"> </a>
-        </h2>
-    </div>
-    
-    <div id="collapse-ZMqkJ1AwIr" class="panel-body collapse">
-
-        <p>Retrieve the credentials for an organization client.</p>
-
-        <h3>Parameters</h3>
-
-        <ul>
-                <li>
-                    <b>orgId</b> (string) <br>
-                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-        </ul>
-
-        <h3>Responses</h3>
-
-        <ul>
-                <li>
-                    <b>200</b>
-                    <ul>
-                        <li>Description: An array of Credential</li>
-                        <li>Schema: [<a href="#credential">Credential</a>]</li>
-                    </ul>
-                </li>
-                <li>
-                    <b>default</b>
-                    <ul>
-                        <li>Description: Unexpected error.</li>
-                        <li>Schema: [<a href="#error">Error</a>]</li>
-                    </ul>
-                </li>
-        </ul>     
-        
-    </div>
-    <!--<div class="panel-footer"></div>-->
-</div>
-
-<div class="panel panel-default">
-    
-    <div class="panel-heading POST">
-        <h2 class="panel-title POST-heading">POST /management/orgs/{orgId}/credentials 
-            <a data-toggle="collapse" data-target="#collapse-eG7QcoefBR"
-                href="#collapse-eG7QcoefBR" class="collapsed collapse-button"> </a>
-        </h2>
-    </div>
-    
-    <div id="collapse-eG7QcoefBR" class="panel-body collapse">
-
-        <p>Generate whole new credentials for an organization client.</p>
-
-        <h3>Parameters</h3>
-
-        <ul>
-                <li>
-                    <b>orgId</b> (string) <br>
-                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-        </ul>
-
-        <h3>Responses</h3>
-
-        <ul>
-                <li>
-                    <b>200</b>
-                    <ul>
-                        <li>Description: An array of Credential</li>
-                        <li>Schema: [<a href="#credential">Credential</a>]</li>
-                    </ul>
-                </li>
-                <li>
-                    <b>default</b>
-                    <ul>
-                        <li>Description: Unexpected error.</li>
-                        <li>Schema: [<a href="#error">Error</a>]</li>
-                    </ul>
-                </li>
-        </ul>     
-        
-    </div>
-    <!--<div class="panel-footer"></div>-->
-</div>
-<a name='Devices-method'></a>
-<h2>Devices Methods</h2>
-
-<div class="panel panel-default">
-    
-    <div class="panel-heading GET">
-        <h2 class="panel-title GET-heading">GET /{orgId}/{appId}/{notificationId}/*/queue 
-            <a data-toggle="collapse" data-target="#collapse-m94kArvzxi"
-                href="#collapse-m94kArvzxi" class="collapsed collapse-button"> </a>
-        </h2>
-    </div>
-    
-    <div id="collapse-m94kArvzxi" class="panel-body collapse">
-
-        <p>Retrieve the list of devices associated with one or more notifications before the notifications are sent through providing all the identifications.</p>
-
-        <h3>Parameters</h3>
-
-        <ul>
-                <li>
-                    <b>orgId</b> (string) <br>
-                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>appId</b> (string) <br>
-                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>notificationId</b> (string) <br>
-                    One of the notification&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-        </ul>
-
-        <h3>Responses</h3>
-
-        <ul>
-                <li>
-                    <b>200</b>
-                    <ul>
-                        <li>Description: An array of retrieved device&#39;s info.</li>
-                        <li>Schema: [<a href="#device">Device</a>]</li>
-                    </ul>
-                </li>
-                <li>
-                    <b>default</b>
-                    <ul>
-                        <li>Description: Unexpected error.</li>
-                        <li>Schema: [<a href="#error">Error</a>]</li>
-                    </ul>
-                </li>
-        </ul>     
-        
-    </div>
-    <!--<div class="panel-footer"></div>-->
-</div>
-<a name='Entity-method'></a>
-<h2>Entity Methods</h2>
-
-<div class="panel panel-default">
-    
-    <div class="panel-heading GET">
-        <h2 class="panel-title GET-heading">GET /{orgId}/{appId}/users/{userId}/{relation} 
-            <a data-toggle="collapse" data-target="#collapse-pIaAhJWMZp"
-                href="#collapse-pIaAhJWMZp" class="collapsed collapse-button"> </a>
-        </h2>
-    </div>
-    
-    <div id="collapse-pIaAhJWMZp" class="panel-body collapse">
-
-        <p>Retrieve a user&#39;s collections or connections through query statement.</p>
-
-        <h3>Parameters</h3>
-
-        <ul>
-                <li>
-                    <b>orgId</b> (string) <br>
-                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>appId</b> (string) <br>
-                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>userId-3</b> (string) <br>
-                    One of the user&#39;s identification which includes username or UUID. (Specified in path).
-                </li>
-                <li>
-                    <b>relation</b> (string) <br>
-                    The relation between user and collections. (Specified in path).
-                </li>
-                <li>
-                    <b>queryStatement</b> () <br>
-                    The query statement of the user. (Specified in query).
-                </li>
-        </ul>
-
-        <h3>Responses</h3>
-
-        <ul>
-                <li>
-                    <b>200</b>
-                    <ul>
-                        <li>Description: An array of user&#39;s collections info.</li>
-                        <li>Schema: [<a href="#entity">Entity</a>]</li>
-                    </ul>
-                </li>
-                <li>
-                    <b>default</b>
-                    <ul>
-                        <li>Description: Unexpected error.</li>
-                        <li>Schema: [<a href="#error">Error</a>]</li>
-                    </ul>
-                </li>
-        </ul>     
-        
-    </div>
-    <!--<div class="panel-footer"></div>-->
-</div>
-
-<div class="panel panel-default">
-    
-    <div class="panel-heading GET">
-        <h2 class="panel-title GET-heading">GET /{orgId}/{appId}/{collectionId} 
-            <a data-toggle="collapse" data-target="#collapse-xW56KedRyq"
-                href="#collapse-xW56KedRyq" class="collapsed collapse-button"> </a>
-        </h2>
-    </div>
-    
-    <div id="collapse-xW56KedRyq" class="panel-body collapse">
-
-        <p>Retrieve collection through query statement.</p>
-
-        <h3>Parameters</h3>
-
-        <ul>
-                <li>
-                    <b>orgId</b> (string) <br>
-                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>appId</b> (string) <br>
-                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>collectionId</b> (string) <br>
-                    One of the collection&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>queryStatement</b> () <br>
-                    Any values specified in the query statement should be enclosed in single-quotes. (Specified in query).
-                </li>
-        </ul>
-
-        <h3>Responses</h3>
-
-        <ul>
-                <li>
-                    <b>200</b>
-                    <ul>
-                        <li>Description: An array of retrieved collection&#39;s info.</li>
-                        <li>Schema: [<a href="#entity">Entity</a>]</li>
-                    </ul>
-                </li>
-                <li>
-                    <b>default</b>
-                    <ul>
-                        <li>Description: Unexpected error.</li>
-                        <li>Schema: [<a href="#error">Error</a>]</li>
-                    </ul>
-                </li>
-        </ul>     
-        
-    </div>
-    <!--<div class="panel-footer"></div>-->
-</div>
-
-<div class="panel panel-default">
-    
-    <div class="panel-heading PUT">
-        <h2 class="panel-title PUT-heading">PUT /{orgId}/{appId}/{collectionId} 
-            <a data-toggle="collapse" data-target="#collapse-Zy8ncQAeme"
-                href="#collapse-Zy8ncQAeme" class="collapsed collapse-button"> </a>
-        </h2>
-    </div>
-    
-    <div id="collapse-Zy8ncQAeme" class="panel-body collapse">
-
-        <p>Update collection through query statement.</p>
-
-        <h3>Parameters</h3>
-
-        <ul>
-                <li>
-                    <b>orgId</b> (string) <br>
-                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>appId</b> (string) <br>
-                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>collectionId</b> (string) <br>
-                    One of the collection&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>queryStatement</b> () <br>
-                    Any values specified in the query statement should be enclosed in single-quotes. (Specified in query).
-                </li>
-        </ul>
-
-        <h3>Responses</h3>
-
-        <ul>
-                <li>
-                    <b>200</b>
-                    <ul>
-                        <li>Description: An array of updated collection&#39;s info.</li>
-                        <li>Schema: [<a href="#entity">Entity</a>]</li>
-                    </ul>
-                </li>
-                <li>
-                    <b>default</b>
-                    <ul>
-                        <li>Description: Unexpected error.</li>
-                        <li>Schema: [<a href="#error">Error</a>]</li>
-                    </ul>
-                </li>
-        </ul>     
-        
-    </div>
-    <!--<div class="panel-footer"></div>-->
-</div>
-
-<div class="panel panel-default">
-    
-    <div class="panel-heading POST">
-        <h2 class="panel-title POST-heading">POST /{orgId}/{appId}/{collectionId}/{entityId1}/{relation}/{entityId2} 
-            <a data-toggle="collapse" data-target="#collapse-ocB2PheyLp"
-                href="#collapse-ocB2PheyLp" class="collapsed collapse-button"> </a>
-        </h2>
-    </div>
-    
-    <div id="collapse-ocB2PheyLp" class="panel-body collapse">
-
-        <p>Add an entity to a collection through providing all the identifications.</p>
-
-        <h3>Parameters</h3>
-
-        <ul>
-                <li>
-                    <b>orgId</b> (string) <br>
-                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>appId</b> (string) <br>
-                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>collectionId</b> (string) <br>
-                    One of the collection&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>entityId1</b> (string) <br>
-                    The Id of the 1st entity. (Specified in path).
-                </li>
-                <li>
-                    <b>relation</b> (string) <br>
-                    The relation between 1st entity and 2nd entity. (Specified in path).
-                </li>
-                <li>
-                    <b>entityId2</b> (string) <br>
-                    The Id of the 2nd entity. (Specified in path).
-                </li>
-        </ul>
-
-        <h3>Responses</h3>
-
-        <ul>
-                <li>
-                    <b>200</b>
-                    <ul>
-                        <li>Description: An array of added entity&#39;s info.</li>
-                        <li>Schema: [<a href="#entity">Entity</a>]</li>
-                    </ul>
-                </li>
-                <li>
-                    <b>default</b>
-                    <ul>
-                        <li>Description: Unexpected error.</li>
-                        <li>Schema: [<a href="#error">Error</a>]</li>
-                    </ul>
-                </li>
-        </ul>     
-        
-    </div>
-    <!--<div class="panel-footer"></div>-->
-</div>
-
-<div class="panel panel-default">
-    
-    <div class="panel-heading DELETE">
-        <h2 class="panel-title DELETE-heading">DELETE /{orgId}/{appId}/{collectionId}/{entityId1}/{relation}/{entityId2} 
-            <a data-toggle="collapse" data-target="#collapse-5zFww1vFfs"
-                href="#collapse-5zFww1vFfs" class="collapsed collapse-button"> </a>
-        </h2>
-    </div>
-    
-    <div id="collapse-5zFww1vFfs" class="panel-body collapse">
-
-        <p>Remove an entity from a collection through providing all the identifications.</p>
-
-        <h3>Parameters</h3>
-
-        <ul>
-                <li>
-                    <b>orgId</b> (string) <br>
-                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>appId</b> (string) <br>
-                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>collectionId</b> (string) <br>
-                    One of the collection&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>entityId1</b> (string) <br>
-                    The Id of the 1st entity. (Specified in path).
-                </li>
-                <li>
-                    <b>relation</b> (string) <br>
-                    The relation between 1st entity and 2nd entity. (Specified in path).
-                </li>
-                <li>
-                    <b>entityId2</b> (string) <br>
-                    The Id of the 2nd entity. (Specified in path).
-                </li>
-        </ul>
-
-        <h3>Responses</h3>
-
-        <ul>
-                <li>
-                    <b>200</b>
-                    <ul>
-                        <li>Description: An array of deleted entity&#39;s info.</li>
-                        <li>Schema: [<a href="#entity">Entity</a>]</li>
-                    </ul>
-                </li>
-                <li>
-                    <b>default</b>
-                    <ul>
-                        <li>Description: Unexpected error.</li>
-                        <li>Schema: [<a href="#error">Error</a>]</li>
-                    </ul>
-                </li>
-        </ul>     
-        
-    </div>
-    <!--<div class="panel-footer"></div>-->
-</div>
-
-<div class="panel panel-default">
-    
-    <div class="panel-heading GET">
-        <h2 class="panel-title GET-heading">GET /{orgId}/{appId}/{collectionId}/{entityId} 
-            <a data-toggle="collapse" data-target="#collapse-1dov3vPnls"
-                href="#collapse-1dov3vPnls" class="collapsed collapse-button"> </a>
-        </h2>
-    </div>
-    
-    <div id="collapse-1dov3vPnls" class="panel-body collapse">
-
-        <p>Retrieve an entity through providing Id of application, organization, collection and entity.</p>
-
-        <h3>Parameters</h3>
-
-        <ul>
-                <li>
-                    <b>orgId</b> (string) <br>
-                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>appId</b> (string) <br>
-                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>collectionId</b> (string) <br>
-                    One of the collection&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>entityId</b> (string) <br>
-                    One of the entity&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-        </ul>
-
-        <h3>Responses</h3>
-
-        <ul>
-                <li>
-                    <b>200</b>
-                    <ul>
-                        <li>Description: An array of retrieved entity&#39;s info.</li>
-                        <li>Schema: [<a href="#entity">Entity</a>]</li>
-                    </ul>
-                </li>
-                <li>
-                    <b>default</b>
-                    <ul>
-                        <li>Description: Unexpected error.</li>
-                        <li>Schema: [<a href="#error">Error</a>]</li>
-                    </ul>
-                </li>
-        </ul>     
-        
-    </div>
-    <!--<div class="panel-footer"></div>-->
-</div>
-
-<div class="panel panel-default">
-    
-    <div class="panel-heading PUT">
-        <h2 class="panel-title PUT-heading">PUT /{orgId}/{appId}/{collectionId}/{entityId} 
-            <a data-toggle="collapse" data-target="#collapse-CMPoM2NkHk"
-                href="#collapse-CMPoM2NkHk" class="collapsed collapse-button"> </a>
-        </h2>
-    </div>
-    
-    <div id="collapse-CMPoM2NkHk" class="panel-body collapse">
-
-        <p>One or more properties can be updated with a single request.</p>
-
-        <h3>Parameters</h3>
-
-        <ul>
-                <li>
-                    <b>orgId</b> (string) <br>
-                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>appId</b> (string) <br>
-                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>collectionId</b> (string) <br>
-                    One of the collection&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>entityId</b> (string) <br>
-                    One of the entity&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>entityproperty</b> (                    <a href="#createentities">CreateEntities</a>) <br>
-                    The properties of the entity. (Specified in body).
-                </li>
-        </ul>
-
-        <h3>Responses</h3>
-
-        <ul>
-                <li>
-                    <b>200</b>
-                    <ul>
-                        <li>Description: An array of updated entity&#39;s info.</li>
-                        <li>Schema: [<a href="#entity">Entity</a>]</li>
-                    </ul>
-                </li>
-                <li>
-                    <b>default</b>
-                    <ul>
-                        <li>Description: Unexpected error.</li>
-                        <li>Schema: [<a href="#error">Error</a>]</li>
-                    </ul>
-                </li>
-        </ul>     
-        
-    </div>
-    <!--<div class="panel-footer"></div>-->
-</div>
-
-<div class="panel panel-default">
-    
-    <div class="panel-heading DELETE">
-        <h2 class="panel-title DELETE-heading">DELETE /{orgId}/{appId}/{collectionId}/{entityId} 
-            <a data-toggle="collapse" data-target="#collapse-Jg2pLwSrSu"
-                href="#collapse-Jg2pLwSrSu" class="collapsed collapse-button"> </a>
-        </h2>
-    </div>
-    
-    <div id="collapse-Jg2pLwSrSu" class="panel-body collapse">
-
-        <p>Delete an entity from the collection.</p>
-
-        <h3>Parameters</h3>
-
-        <ul>
-                <li>
-                    <b>orgId</b> (string) <br>
-                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>appId</b> (string) <br>
-                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>collectionId</b> (string) <br>
-                    One of the collection&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>entityId</b> (string) <br>
-                    One of the entity&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-        </ul>
-
-        <h3>Responses</h3>
-
-        <ul>
-                <li>
-                    <b>200</b>
-                    <ul>
-                        <li>Description: An array of deleted entity&#39;s info.</li>
-                        <li>Schema: [<a href="#entity">Entity</a>]</li>
-                    </ul>
-                </li>
-                <li>
-                    <b>default</b>
-                    <ul>
-                        <li>Description: Unexpected error.</li>
-                        <li>Schema: [<a href="#error">Error</a>]</li>
-                    </ul>
-                </li>
-        </ul>     
-        
-    </div>
-    <!--<div class="panel-footer"></div>-->
-</div>
-
-<div class="panel panel-default">
-    
-    <div class="panel-heading POST">
-        <h2 class="panel-title POST-heading">POST /{orgId}/{appId}/{entitytype} 
-            <a data-toggle="collapse" data-target="#collapse-o8OSLLkp41"
-                href="#collapse-o8OSLLkp41" class="collapsed collapse-button"> </a>
-        </h2>
-    </div>
-    
-    <div id="collapse-o8OSLLkp41" class="panel-body collapse">
-
-        <p>When a new entity is created, Usergrid will automatically create a corresponding collection if one does not already exist. The collection will automatically be named with the plural form of the entity type. </p>
-
-        <h3>Parameters</h3>
-
-        <ul>
-                <li>
-                    <b>orgId</b> (string) <br>
-                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>appId</b> (string) <br>
-                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>entitytype</b> (string) <br>
-                    The entity type to create. (Specified in path).
-                </li>
-                <li>
-                    <b>entityproperty</b> (                    <a href="#createentities">CreateEntities</a>) <br>
-                    The properties of the entity. (Specified in body).
-                </li>
-        </ul>
-
-        <h3>Responses</h3>
-
-        <ul>
-                <li>
-                    <b>200</b>
-                    <ul>
-                        <li>Description: An array of created custom entity&#39;s info.</li>
-                        <li>Schema: [<a href="#entity">Entity</a>]</li>
-                    </ul>
-                </li>
-                <li>
-                    <b>default</b>
-                    <ul>
-                        <li>Description: Unexpected error.</li>
-                        <li>Schema: [<a href="#error">Error</a>]</li>
-                    </ul>
-                </li>
-        </ul>     
-        
-    </div>
-    <!--<div class="panel-footer"></div>-->
-</div>
-<a name='Event-method'></a>
-<h2>Event Methods</h2>
-
-<div class="panel panel-default">
-    
-    <div class="panel-heading POST">
-        <h2 class="panel-title POST-heading">POST /{orgId}/{appId}/events 
-            <a data-toggle="collapse" data-target="#collapse-qnPBoA07vy"
-                href="#collapse-qnPBoA07vy" class="collapsed collapse-button"> </a>
-        </h2>
-    </div>
-    
-    <div id="collapse-qnPBoA07vy" class="panel-body collapse">
-
-        <p>Create an event through providing both Id of organization and application.</p>
-
-        <h3>Parameters</h3>
-
-        <ul>
-                <li>
-                    <b>orgId</b> (string) <br>
-                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>appId</b> (string) <br>
-                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>CreateEvent</b> (                    <a href="#createevent">CreateEvent</a>) <br>
-                    The required property of the event. (Specified in body).
-                </li>
-        </ul>
-
-        <h3>Responses</h3>
-
-        <ul>
-                <li>
-                    <b>200</b>
-                    <ul>
-                        <li>Description: An array of created event&#39;s info.</li>
-                        <li>Schema: [<a href="#event">Event</a>]</li>
-                    </ul>
-                </li>
-                <li>
-                    <b>default</b>
-                    <ul>
-                        <li>Description: Unexpected error.</li>
-                        <li>Schema: [<a href="#error">Error</a>]</li>
-                    </ul>
-                </li>
-        </ul>     
-        
-    </div>
-    <!--<div class="panel-footer"></div>-->
-</div>
-<a name='Group-method'></a>
-<h2>Group Methods</h2>
-
-<div class="panel panel-default">
-    
-    <div class="panel-heading POST">
-        <h2 class="panel-title POST-heading">POST /{orgId}/{appId}/groups 
-            <a data-toggle="collapse" data-target="#collapse-4qiW3TsSSu"
-                href="#collapse-4qiW3TsSSu" class="collapsed collapse-button"> </a>
-        </h2>
-    </div>
-    
-    <div id="collapse-4qiW3TsSSu" class="panel-body collapse">
-
-        <p>Create a new group through providing both Id of organization and application.</p>
-
-        <h3>Parameters</h3>
-
-        <ul>
-                <li>
-                    <b>orgId</b> (string) <br>
-                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>appId</b> (string) <br>
-                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>groupproperty</b> (                    <a href="#creategroup">CreateGroup</a>) <br>
-                    The property of the created group. (Specified in body).
-                </li>
-        </ul>
-
-        <h3>Responses</h3>
-
-        <ul>
-                <li>
-                    <b>200</b>
-                    <ul>
-                        <li>Description: An array of created group&#39;s info.</li>
-                        <li>Schema: [<a href="#group">Group</a>]</li>
-                    </ul>
-                </li>
-                <li>
-                    <b>default</b>
-                    <ul>
-                        <li>Description: Unexpected error.</li>
-                        <li>Schema: [<a href="#error">Error</a>]</li>
-                    </ul>
-                </li>
-        </ul>     
-        
-    </div>
-    <!--<div class="panel-footer"></div>-->
-</div>
-
-<div class="panel panel-default">
-    
-    <div class="panel-heading GET">
-        <h2 class="panel-title GET-heading">GET /{org_Id}/{app_Id}/groups/{groupId} 
-            <a data-toggle="collapse" data-target="#collapse-mh3TFMiqlw"
-                href="#collapse-mh3TFMiqlw" class="collapsed collapse-button"> </a>
-        </h2>
-    </div>
-    
-    <div id="collapse-mh3TFMiqlw" class="panel-body collapse">
-
-        <p>Get a group through through providing all the identifications.</p>
-
-        <h3>Parameters</h3>
-
-        <ul>
-                <li>
-                    <b>orgId</b> (string) <br>
-                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>appId</b> (string) <br>
-                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>groupId</b> (string) <br>
-                    One of the group&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-        </ul>
-
-        <h3>Responses</h3>
-
-        <ul>
-                <li>
-                    <b>200</b>
-                    <ul>
-                        <li>Description: An array of retrieved group&#39;s info.</li>
-                        <li>Schema: [<a href="#group">Group</a>]</li>
-                    </ul>
-                </li>
-                <li>
-                    <b>default</b>
-                    <ul>
-                        <li>Description: Unexpected error.</li>
-                        <li>Schema: [<a href="#error">Error</a>]</li>
-                    </ul>
-                </li>
-        </ul>     
-        
-    </div>
-    <!--<div class="panel-footer"></div>-->
-</div>
-
-<div class="panel panel-default">
-    
-    <div class="panel-heading PUT">
-        <h2 class="panel-title PUT-heading">PUT /{org_Id}/{app_Id}/groups/{groupId} 
-            <a data-toggle="collapse" data-target="#collapse-Ytvz84UP9Q"
-                href="#collapse-Ytvz84UP9Q" class="collapsed collapse-button"> </a>
-        </h2>
-    </div>
-    
-    <div id="collapse-Ytvz84UP9Q" class="panel-body collapse">
-
-        <p>Update a group through providing all the identifications.</p>
-
-        <h3>Parameters</h3>
-
-        <ul>
-                <li>
-                    <b>orgId</b> (string) <br>
-                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>appId</b> (string) <br>
-                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>groupId</b> (string) <br>
-                    One of the group&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-        </ul>
-
-        <h3>Responses</h3>
-
-        <ul>
-                <li>
-                    <b>200</b>
-                    <ul>
-                        <li>Description: An array of updated group&#39;s info.</li>
-                        <li>Schema: [<a href="#group">Group</a>]</li>
-                    </ul>
-                </li>
-                <li>
-                    <b>default</b>
-                    <ul>
-                        <li>Description: Unexpected error.</li>
-                        <li>Schema: [<a href="#error">Error</a>]</li>
-                    </ul>
-                </li>
-        </ul>     
-        
-    </div>
-    <!--<div class="panel-footer"></div>-->
-</div>
-<a name='Notification-method'></a>
-<h2>Notification Methods</h2>
-
-<div class="panel panel-default">
-    
-    <div class="panel-heading PUT">
-        <h2 class="panel-title PUT-heading">PUT /my-org/sandbox/notifications/{notificationId} 
-            <a data-toggle="collapse" data-target="#collapse-2X3BWwAy5v"
-                href="#collapse-2X3BWwAy5v" class="collapsed collapse-button"> </a>
-        </h2>
-    </div>
-    
-    <div id="collapse-2X3BWwAy5v" class="panel-body collapse">
-
-        <p>Cancel sent notifications through providing the Id of the notification.</p>
-
-        <h3>Parameters</h3>
-
-        <ul>
-                <li>
-                    <b>notificationId</b> (string) <br>
-                    One of the notification&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>cancelMsg</b> (                    <a href="#cancelmsg">CancelMSG</a>) <br>
-                    Indicete whether is canceled or not. (Specified in body).
-                </li>
-        </ul>
-
-        <h3>Responses</h3>
-
-        <ul>
-                <li>
-                    <b>200</b>
-                    <ul>
-                        <li>Description: An array of canceled notification&#39;s info.</li>
-                        <li>Schema: [<a href="#notification">Notification</a>]</li>
-                    </ul>
-                </li>
-                <li>
-                    <b>default</b>
-                    <ul>
-                        <li>Description: Unexpected error.</li>
-                        <li>Schema: [<a href="#error">Error</a>]</li>
-                    </ul>
-                </li>
-        </ul>     
-        
-    </div>
-    <!--<div class="panel-footer"></div>-->
-</div>
-
-<div class="panel panel-default">
-    
-    <div class="panel-heading POST">
-        <h2 class="panel-title POST-heading">POST /{orgId}/{appId}/devices 
-            <a data-toggle="collapse" data-target="#collapse-oPXCIDKL6a"
-                href="#collapse-oPXCIDKL6a" class="collapsed collapse-button"> </a>
-        </h2>
-    </div>
-    
-    <div id="collapse-oPXCIDKL6a" class="panel-body collapse">
-
-        <p>Create notifications for user through targeting by location and providing all the identifications.</p>
-
-        <h3>Parameters</h3>
-
-        <ul>
-                <li>
-                    <b>orgId</b> (string) <br>
-                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>appId</b> (string) <br>
-                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>notification</b> (                    <a href="#createnotifications">CreateNotifications</a>) <br>
-                    These parameters are used when forming the notification portion of the request. (Specified in body).
-                </li>
-                <li>
-                    <b>scheduleNotification</b> (                    <a href="#schedulenotification">ScheduleNotification</a>) <br>
-                    To schedule a notification for a later time add the deliver parameter with a UNIX timestamp to the body of your request. (Specified in body).
-                </li>
-                <li>
-                    <b>setExpiration</b> (                    <a href="#setexpiration">SetExpiration</a>) <br>
-                    If a push service can&#39;t deliver a message to a device and needs to resend it you can set a notification to expire after a certain date/time. (Specified in body).
-                </li>
-                <li>
-                    <b>queryStatement</b> () <br>
-                    The query statement of the location of the user. (Specified in query).
-                </li>
-        </ul>
-
-        <h3>Responses</h3>
-
-        <ul>
-                <li>
-                    <b>200</b>
-                    <ul>
-                        <li>Description: An array of created notification&#39;s info.</li>
-                        <li>Schema: [<a href="#notification">Notification</a>]</li>
-                    </ul>
-                </li>
-                <li>
-                    <b>default</b>
-                    <ul>
-                        <li>Description: Unexpected error.</li>
-                        <li>Schema: [<a href="#error">Error</a>]</li>
-                    </ul>
-                </li>
-        </ul>     
-        
-    </div>
-    <!--<div class="panel-footer"></div>-->
-</div>
-
-<div class="panel panel-default">
-    
-    <div class="panel-heading POST">
-        <h2 class="panel-title POST-heading">POST /{orgId}/{appId}/devices/*/notifications 
-            <a data-toggle="collapse" data-target="#collapse-QHRHWLFRwh"
-                href="#collapse-QHRHWLFRwh" class="collapsed collapse-button"> </a>
-        </h2>
-    </div>
-    
-    <div id="collapse-QHRHWLFRwh" class="panel-body collapse">
-
-        <p>Create notifications for all devices. This request will target all device entities.</p>
-
-        <h3>Parameters</h3>
-
-        <ul>
-                <li>
-                    <b>orgId</b> (string) <br>
-                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>appId</b> (string) <br>
-                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>notification</b> (                    <a href="#createnotifications">CreateNotifications</a>) <br>
-                    These parameters are used when forming the notification portion of the request. (Specified in body).
-                </li>
-                <li>
-                    <b>scheduleNotification</b> (                    <a href="#schedulenotification">ScheduleNotification</a>) <br>
-                    To schedule a notification for a later time add the deliver parameter with a UNIX timestamp to the body of your request. (Specified in body).
-                </li>
-                <li>
-                    <b>setExpiration</b> (                    <a href="#setexpiration">SetExpiration</a>) <br>
-                    If a push service can&#39;t deliver a message to a device and needs to resend it you can set a notification to expire after a certain date/time. (Specified in body).
-                </li>
-        </ul>
-
-        <h3>Responses</h3>
-
-        <ul>
-                <li>
-                    <b>200</b>
-                    <ul>
-                        <li>Description: An array of created notification&#39;s info.</li>
-                        <li>Schema: [<a href="#notification">Notification</a>]</li>
-                    </ul>
-                </li>
-                <li>
-                    <b>default</b>
-                    <ul>
-                        <li>Description: Unexpected error.</li>
-                        <li>Schema: [<a href="#error">Error</a>]</li>
-                    </ul>
-                </li>
-        </ul>     
-        
-    </div>
-    <!--<div class="panel-footer"></div>-->
-</div>
-
-<div class="panel panel-default">
-    
-    <div class="panel-heading POST">
-        <h2 class="panel-title POST-heading">POST /{orgId}/{appId}/devices/{deviceId}/notifications 
-            <a data-toggle="collapse" data-target="#collapse-YK5TdQKJ4Z"
-                href="#collapse-YK5TdQKJ4Z" class="collapsed collapse-button"> </a>
-        </h2>
-    </div>
-    
-    <div id="collapse-YK5TdQKJ4Z" class="panel-body collapse">
-
-        <p>Create notifications for a single device. This request will target a specific device entity.</p>
-
-        <h3>Parameters</h3>
-
-        <ul>
-                <li>
-                    <b>orgId</b> (string) <br>
-                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>appId</b> (string) <br>
-                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>deviceId</b> (string) <br>
-                    One of the device&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>notification</b> (                    <a href="#createnotifications">CreateNotifications</a>) <br>
-                    These parameters are used when forming the notification portion of the request. (Specified in body).
-                </li>
-                <li>
-                    <b>scheduleNotification</b> (                    <a href="#schedulenotification">ScheduleNotification</a>) <br>
-                    To schedule a notification for a later time add the deliver parameter with a UNIX timestamp to the body of your request. (Specified in body).
-                </li>
-                <li>
-                    <b>setExpiration</b> (                    <a href="#setexpiration">SetExpiration</a>) <br>
-                    If a push service can&#39;t deliver a message to a device and needs to resend it you can set a notification to expire after a certain date/time. (Specified in body).
-                </li>
-        </ul>
-
-        <h3>Responses</h3>
-
-        <ul>
-                <li>
-                    <b>200</b>
-                    <ul>
-                        <li>Description: An array of created notification&#39;s info.</li>
-                        <li>Schema: [<a href="#notification">Notification</a>]</li>
-                    </ul>
-                </li>
-                <li>
-                    <b>default</b>
-                    <ul>
-                        <li>Description: Unexpected error.</li>
-                        <li>Schema: [<a href="#error">Error</a>]</li>
-                    </ul>
-                </li>
-        </ul>     
-        
-    </div>
-    <!--<div class="panel-footer"></div>-->
-</div>
-
-<div class="panel panel-default">
-    
-    <div class="panel-heading POST">
-        <h2 class="panel-title POST-heading">POST /{orgId}/{appId}/groups/{path}/notifications 
-            <a data-toggle="collapse" data-target="#collapse-ygcIRQJpNR"
-                href="#collapse-ygcIRQJpNR" class="collapsed collapse-button"> </a>
-        </h2>
-    </div>
-    
-    <div id="collapse-ygcIRQJpNR" class="panel-body collapse">
-
-        <p>Create notifications for a group. This request will target all users associated with a specific group entity.</p>
-
-        <h3>Parameters</h3>
-
-        <ul>
-                <li>
-                    <b>orgId</b> (string) <br>
-                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>appId</b> (string) <br>
-                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>path</b> (string) <br>
-                    The path of the group. (Specified in path).
-                </li>
-                <li>
-                    <b>notification</b> (                    <a href="#createnotifications">CreateNotifications</a>) <br>
-                    These parameters are used when forming the notification portion of the request. (Specified in body).
-                </li>
-                <li>
-                    <b>scheduleNotification</b> (                    <a href="#schedulenotification">ScheduleNotification</a>) <br>
-                    To schedule a notification for a later time add the deliver parameter with a UNIX timestamp to the body of your request. (Specified in body).
-                </li>
-                <li>
-                    <b>setExpiration</b> (                    <a href="#setexpiration">SetExpiration</a>) <br>
-                    If a push service can&#39;t deliver a message to a device and needs to resend it you can set a notification to expire after a certain date/time. (Specified in body).
-                </li>
-        </ul>
-
-        <h3>Responses</h3>
-
-        <ul>
-                <li>
-                    <b>200</b>
-                    <ul>
-                        <li>Description: An array of created notification&#39;s info.</li>
-                        <li>Schema: [<a href="#notification">Notification</a>]</li>
-                    </ul>
-                </li>
-                <li>
-                    <b>default</b>
-                    <ul>
-                        <li>Description: Unexpected error.</li>
-                        <li>Schema: [<a href="#error">Error</a>]</li>
-                    </ul>
-                </li>
-        </ul>     
-        
-    </div>
-    <!--<div class="panel-footer"></div>-->
-</div>
-
-<div class="panel panel-default">
-    
-    <div class="panel-heading GET">
-        <h2 class="panel-title GET-heading">GET /{orgId}/{appId}/notifications 
-            <a data-toggle="collapse" data-target="#collapse-dapPIY8Bor"
-                href="#collapse-dapPIY8Bor" class="collapsed collapse-button"> </a>
-        </h2>
-    </div>
-    
-    <div id="collapse-dapPIY8Bor" class="panel-body collapse">
-
-        <p>Retrieve one or more notifications through providing all the identifications.</p>
-
-        <h3>Parameters</h3>
-
-        <ul>
-                <li>
-                    <b>orgId</b> (string) <br>
-                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>appId</b> (string) <br>
-                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-        </ul>
-
-        <h3>Responses</h3>
-
-        <ul>
-                <li>
-                    <b>200</b>
-                    <ul>
-                        <li>Description: An array of retrieved notification&#39;s info.</li>
-                        <li>Schema: [<a href="#notification">Notification</a>]</li>
-                    </ul>
-                </li>
-                <li>
-                    <b>default</b>
-                    <ul>
-                        <li>Description: Unexpected error.</li>
-                        <li>Schema: [<a href="#error">Error</a>]</li>
-                    </ul>
-                </li>
-        </ul>     
-        
-    </div>
-    <!--<div class="panel-footer"></div>-->
-</div>
-
-<div class="panel panel-default">
-    
-    <div class="panel-heading DELETE">
-        <h2 class="panel-title DELETE-heading">DELETE /{orgId}/{appId}/notifications/{notificationId} 
-            <a data-toggle="collapse" data-target="#collapse-Ewtulp8IFk"
-                href="#collapse-Ewtulp8IFk" class="collapsed collapse-button"> </a>
-        </h2>
-    </div>
-    
-    <div id="collapse-Ewtulp8IFk" class="panel-body collapse">
-
-        <p>Remove unsent notifications through providing all the identifications.</p>
-
-        <h3>Parameters</h3>
-
-        <ul>
-                <li>
-                    <b>orgId</b> (string) <br>
-                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>appId</b> (string) <br>
-                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>notificationId</b> (string) <br>
-                    One of the notification&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-        </ul>
-
-        <h3>Responses</h3>
-
-        <ul>
-                <li>
-                    <b>200</b>
-                    <ul>
-                        <li>Description: An array of deleted notification&#39;s info.</li>
-                        <li>Schema: [<a href="#notification">Notification</a>]</li>
-                    </ul>
-                </li>
-                <li>
-                    <b>default</b>
-                    <ul>
-                        <li>Description: Unexpected error.</li>
-                        <li>Schema: [<a href="#error">Error</a>]</li>
-                    </ul>
-                </li>
-        </ul>     
-        
-    </div>
-    <!--<div class="panel-footer"></div>-->
-</div>
-
-<div class="panel panel-default">
-    
-    <div class="panel-heading POST">
-        <h2 class="panel-title POST-heading">POST /{orgId}/{appId}/users/{userId}/notifications 
-            <a data-toggle="collapse" data-target="#collapse-iuRATGDSDn"
-                href="#collapse-iuRATGDSDn" class="collapsed collapse-button"> </a>
-        </h2>
-    </div>
-    
-    <div id="collapse-iuRATGDSDn" class="panel-body collapse">
-
-        <p>Create notifications for a user. This request will target a specific user entity.</p>
-
-        <h3>Parameters</h3>
-
-        <ul>
-                <li>
-                    <b>orgId</b> (string) <br>
-                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>appId</b> (string) <br>
-                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>userId-3</b> (string) <br>
-                    One of the user&#39;s identification which includes username or UUID. (Specified in path).
-                </li>
-                <li>
-                    <b>notification</b> (                    <a href="#createnotifications">CreateNotifications</a>) <br>
-                    These parameters are used when forming the notification portion of the request. (Specified in body).
-                </li>
-                <li>
-                    <b>scheduleNotification</b> (                    <a href="#schedulenotification">ScheduleNotification</a>) <br>
-                    To schedule a notification for a later time add the deliver parameter with a UNIX timestamp to the body of your request. (Specified in body).
-                </li>
-                <li>
-                    <b>setExpiration</b> (                    <a href="#setexpiration">SetExpiration</a>) <br>
-                    If a push service can&#39;t deliver a message to a device and needs to resend it you can set a notification to expire after a certain date/time. (Specified in body).
-                </li>
-        </ul>
-
-        <h3>Responses</h3>
-
-        <ul>
-                <li>
-                    <b>200</b>
-                    <ul>
-                        <li>Description: An array of created notification&#39;s info.</li>
-                        <li>Schema: [<a href="#notification">Notification</a>]</li>
-                    </ul>
-                </li>
-                <li>
-                    <b>default</b>
-                    <ul>
-                        <li>Description: Unexpected error.</li>
-                        <li>Schema: [<a href="#error">Error</a>]</li>
-                    </ul>
-                </li>
-        </ul>     
-        
-    </div>
-    <!--<div class="panel-footer"></div>-->
-</div>
-
-<div class="panel panel-default">
-    
-    <div class="panel-heading GET">
-        <h2 class="panel-title GET-heading">GET /{orgId}/{appId}/{receiptId}/*/notifications 
-            <a data-toggle="collapse" data-target="#collapse-MVtYUm9Thh"
-                href="#collapse-MVtYUm9Thh" class="collapsed collapse-button"> </a>
-        </h2>
-    </div>
-    
-    <div id="collapse-MVtYUm9Thh" class="panel-body collapse">
-
-        <p>Retrieve notifications associated with one or more receipts through providing all the identifications.</p>
-
-        <h3>Parameters</h3>
-
-        <ul>
-                <li>
-                    <b>orgId</b> (string) <br>
-                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>appId</b> (string) <br>
-                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>receiptId</b> (string) <br>
-                    One of the receipt&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-        </ul>
-
-        <h3>Responses</h3>
-
-        <ul>
-                <li>
-                    <b>200</b>
-                    <ul>
-                        <li>Description: An array of retrieved notification&#39;s info.</li>
-                        <li>Schema: [<a href="#notification">Notification</a>]</li>
-                    </ul>
-                </li>
-                <li>
-                    <b>default</b>
-                    <ul>
-                        <li>Description: Unexpected error.</li>
-                        <li>Schema: [<a href="#error">Error</a>]</li>
-                    </ul>
-                </li>
-        </ul>     
-        
-    </div>
-    <!--<div class="panel-footer"></div>-->
-</div>
-<a name='Organization-method'></a>
-<h2>Organization Methods</h2>
-
-<div class="panel panel-default">
-    
-    <div class="panel-heading POST">
-        <h2 class="panel-title POST-heading">POST /management/orgs 
-            <a data-toggle="collapse" data-target="#collapse-vUb9W088QZ"
-                href="#collapse-vUb9W088QZ" class="collapsed collapse-button"> </a>
-        </h2>
-    </div>
-    
-    <div id="collapse-vUb9W088QZ" class="panel-body collapse">
-
-        <p>Create an organization through a form post.</p>
-
-        <h3>Parameters</h3>
-
-        <ul>
-                <li>
-                    <b>CreateOrg</b> (                    <a href="#createorg">CreateOrg</a>) <br>
-                    A set of organization properties supplied through a form. (Specified in body).
-                </li>
-        </ul>
-
-        <h3>Responses</h3>
-
-        <ul>
-                <li>
-                    <b>200</b>
-                    <ul>
-                        <li>Description: An array of created Organization.</li>
-                        <li>Schema: [<a href="#organization">Organization</a>]</li>
-                    </ul>
-                </li>
-                <li>
-                    <b>default</b>
-                    <ul>
-                        <li>Description: Unexpected error.</li>
-                        <li>Schema: [<a href="#error">Error</a>]</li>
-                    </ul>
-                </li>
-        </ul>     
-        
-    </div>
-    <!--<div class="panel-footer"></div>-->
-</div>
-
-<div class="panel panel-default">
-    
-    <div class="panel-heading GET">
-        <h2 class="panel-title GET-heading">GET /management/orgs/{orgId} 
-            <a data-toggle="collapse" data-target="#collapse-cwUcW5lEAU"
-                href="#collapse-cwUcW5lEAU" class="collapsed collapse-button"> </a>
-        </h2>
-    </div>
-    
-    <div id="collapse-cwUcW5lEAU" class="panel-body collapse">
-
-        <p>Retrieve an organization given a specified UUID or username.</p>


<TRUNCATED>

[18/60] [abbrv] incubator-usergrid git commit: cherry picking docs from master

[sn...@apache.org]

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/getting-started/creating-a-new-application.html
----------------------------------------------------------------------
diff --git a/content/docs/getting-started/creating-a-new-application.html b/content/docs/getting-started/creating-a-new-application.html
new file mode 100644
index 0000000..c470fc1
--- /dev/null
+++ b/content/docs/getting-started/creating-a-new-application.html
@@ -0,0 +1,320 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>Creating a new application &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+        <link rel="next" title="Creating an Usergrid Account" href="creating-account.html"/>
+        <link rel="prev" title="Async vs. sync calls" href="../introduction/async-vs-sync.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul class="current">
+<li class="toctree-l1 current"><a class="current reference internal" href="">Creating a new application</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#creating-an-application">Creating an application</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#securing-an-application">Securing an application</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>Creating a new application</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/getting-started/creating-a-new-application.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="creating-a-new-application">
+<h1>Creating a new application<a class="headerlink" href="#creating-a-new-application" title="Permalink to this headline">¶</a></h1>
+<div class="section" id="creating-an-application">
+<h2>Creating an application<a class="headerlink" href="#creating-an-application" title="Permalink to this headline">¶</a></h2>
+<p>You can use the admin portal to create applications. An application
+represents the data associated with your app. Through an application,
+you handle the entities associated with your app, including users,
+devices, events, and so on.</p>
+<p>To create a new application with the admin portal:</p>
+<ol class="arabic simple">
+<li>In the admin portal, from the dropdown menu at the far top left,
+select the organization to which you will add the new application.</li>
+<li>Click the ADD NEW APP button, located at the top of the screen, next
+to the application drop-down.</li>
+<li>In the dialog box, enter a new application name, then click the
+Create button. Your new application will automatically be selected in
+the applications drop-down menu. Applications can also be created
+programmatically with a POST request to the API. For more, see
+Application.</li>
+</ol>
+</div>
+<div class="section" id="securing-an-application">
+<h2>Securing an application<a class="headerlink" href="#securing-an-application" title="Permalink to this headline">¶</a></h2>
+<p>If this is going to be a production application, be sure to configure
+security roles that provide only the level of access your users will
+need. For more on security, see Security best practices.</p>
+</div>
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+      
+        <a href="creating-account.html" class="btn btn-neutral float-right" title="Creating an Usergrid Account" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+      
+      
+        <a href="../introduction/async-vs-sync.html" class="btn btn-neutral" title="Async vs. sync calls" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+      
+    </div>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/getting-started/creating-account.html
----------------------------------------------------------------------
diff --git a/content/docs/getting-started/creating-account.html b/content/docs/getting-started/creating-account.html
new file mode 100644
index 0000000..e3b6ed6
--- /dev/null
+++ b/content/docs/getting-started/creating-account.html
@@ -0,0 +1,327 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>Creating an Usergrid Account &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+        <link rel="next" title="Using a Sandbox Application" href="using-a-sandbox-app.html"/>
+        <link rel="prev" title="Creating a new application" href="creating-a-new-application.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">Creating an Usergrid Account</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#next-steps">Next steps</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>Creating an Usergrid Account</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/getting-started/creating-account.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="creating-an-usergrid-account">
+<h1>Creating an Usergrid Account<a class="headerlink" href="#creating-an-usergrid-account" title="Permalink to this headline">¶</a></h1>
+<p>To get started using the Usergrid, you&#8217;ll need an Usergrid account.
+(Before reading this, you should already be familiar with what Usergrid
+can do to support your apps. If you&#8217;re still curious about that, you
+might want to read Usergrid features first.)</p>
+<p>With an account, you get the following useful things:</p>
+<ul class="simple">
+<li>A sandbox application you can try things with (we automatically
+create one for you with your new account). The sandbox is a
+partitioned area of the data store where you can add example data and
+try out API calls. The sandbox isn&#8217;t secure, but it&#8217;s handy to play
+in. For more about the sandbox, see &#8220;Using Your Application Sandbox&#8221;.</li>
+<li>The ability to create more applications (in addition to the sandbox).
+You can (and should!) make these as secure as you need to. These are
+the applications that you&#8217;ll have behind the apps you make available
+to your users.</li>
+<li>Access to the Admin Portal. In the portal, you can do the following:
+** Create and manage applications. ** Manage your app&#8217;s users,
+including access levels. ** Manage the data in your app. **
+Manage app features, including push notifications, activities,
+analytics, and so on. ** Try out API calls with a shell command
+window. ** To create an Usergrid account and see a very short
+tutorial to get started with, go to the get started page.</li>
+</ul>
+<div class="section" id="next-steps">
+<h2>Next steps<a class="headerlink" href="#next-steps" title="Permalink to this headline">¶</a></h2>
+<p>Ready to learn and do more?</p>
+<ul class="simple">
+<li>Install an SDK that will be most useful for your application
+environment. For more about Usergrid&#8217;s SDKs, see SDKs.</li>
+<li>Review Usergrid features for information on concepts and features.</li>
+<li>Consult the API Reference for usage details.</li>
+</ul>
+</div>
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+      
+        <a href="using-a-sandbox-app.html" class="btn btn-neutral float-right" title="Using a Sandbox Application" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+      
+      
+        <a href="creating-a-new-application.html" class="btn btn-neutral" title="Creating a new application" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+      
+    </div>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/getting-started/using-a-sandbox-app.html
----------------------------------------------------------------------
diff --git a/content/docs/getting-started/using-a-sandbox-app.html b/content/docs/getting-started/using-a-sandbox-app.html
new file mode 100644
index 0000000..a2494dc
--- /dev/null
+++ b/content/docs/getting-started/using-a-sandbox-app.html
@@ -0,0 +1,357 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>Using a Sandbox Application &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+        <link rel="next" title="Using the API" href="using-the-api.html"/>
+        <link rel="prev" title="Creating an Usergrid Account" href="creating-account.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">Using a Sandbox Application</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#what-is-the-sandbox-application">What is the sandbox application?</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#is-the-sandbox-secure">Is the sandbox secure?</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#creating-a-new-sandbox-application">Creating a New Sandbox Application</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>Using a Sandbox Application</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/getting-started/using-a-sandbox-app.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="using-a-sandbox-application">
+<h1>Using a Sandbox Application<a class="headerlink" href="#using-a-sandbox-application" title="Permalink to this headline">¶</a></h1>
+<div class="section" id="what-is-the-sandbox-application">
+<h2>What is the sandbox application?<a class="headerlink" href="#what-is-the-sandbox-application" title="Permalink to this headline">¶</a></h2>
+<p>When you create a new Usergrid account (see Creating an Usergrid
+Account) to use services for developers, Usergrid creates a new
+application for you on its servers. With the new application, called
+&#8220;sandbox,&#8221; you can add your own example data and try out API calls that
+do things with the data. Be sure to see Using the API for suggestions.</p>
+</div>
+<div class="section" id="is-the-sandbox-secure">
+<h2>Is the sandbox secure?<a class="headerlink" href="#is-the-sandbox-secure" title="Permalink to this headline">¶</a></h2>
+<p>To keep things simple and make it easier for you to try things out, the
+sandbox application has all authentication disabled. That way, it
+doesn’t require an access token for application-level calls to the API.
+Permissions are so open on the sandbox application because its &#8220;guest&#8221;
+role offers full permissions for all access paths &#8211; that is, GET, POST,
+PUT, and DELETE for /**. Learn more about roles and permissions in
+Managing access by defining permission rules.</p>
+<!-- workaround a Sphinx bug -->
+<div class="admonition warning"><p class="first admonition-title"><p>Warning</p>
+</p><p class="last">
+<p class="last"><p>Never use a sandbox app for production. Keep in mind that the lack of
+authentication means that a sandbox application is not secure enough for
+important or sensitive data. A sandbox is just for experimentation while
+you learn how the services work, and should never be used for a
+production application. As with other Usergrid applications you create,
+a sandbox application is an area of the data store where you can put
+your own data. You can create as many other applications as you like,
+including more sandbox applications. When it comes to production
+(secured) applications, a good rule of thumb is to create one
+application for each mobile app you develop.</p>
+</p>
+</div></div>
+<div class="section" id="creating-a-new-sandbox-application">
+<h2>Creating a New Sandbox Application<a class="headerlink" href="#creating-a-new-sandbox-application" title="Permalink to this headline">¶</a></h2>
+<p>You may want to create (or re-create) a sandbox application. For
+example, you may want to create a sandbox application for another
+organization or you may want to create another application for testing
+purposes.</p>
+<!-- workaround a Sphinx bug -->
+<div class="admonition warning"><p class="first admonition-title"><p>Warning</p>
+</p><p class="last"><p>Guest Role should never be given full permissions. Giving the guest role
+full permissions should be used only for testing and should not be used
+in production. Before you make your app “live”, you should remove the
+guest permissions for /**.</p>
+</p></div><p>Use the following steps to create a sandbox app:</p>
+<ol class="arabic simple">
+<li>Create a new application using the admin portal. You can name the
+application whatever you like (including &#8220;sandbox&#8221;).</li>
+<li>Set full access permissions for the guest role, as follows:<ol class="arabic">
+<li>In the admin portal, click Users, then click Roles.</li>
+<li>On the Roles page, in the list of roles, click Guest.</li>
+<li>For the Guest role, under Permissions, click Add Permission.</li>
+<li>In the New Permission dialog, enter the following in the Path box:
+<code class="docutils literal"><span class="pre">/**</span></code></li>
+<li>Select the following check boxes: get, post, put, and delete.</li>
+<li>Click the Add button.</li>
+<li>If there are other permissions listed, delete them.</li>
+</ol>
+</li>
+</ol>
+</div>
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+      
+        <a href="using-the-api.html" class="btn btn-neutral float-right" title="Using the API" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+      
+      
+        <a href="creating-account.html" class="btn btn-neutral" title="Creating an Usergrid Account" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+      
+    </div>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/getting-started/using-the-api.html
----------------------------------------------------------------------
diff --git a/content/docs/getting-started/using-the-api.html b/content/docs/getting-started/using-the-api.html
new file mode 100644
index 0000000..d80add6
--- /dev/null
+++ b/content/docs/getting-started/using-the-api.html
@@ -0,0 +1,491 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>Using the API &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+        <link rel="next" title="The Usergrid Data Store" href="../data-storage/data-store-dbms.html"/>
+        <link rel="prev" title="Using a Sandbox Application" href="using-a-sandbox-app.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">Using the API</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#supported-http-methods">Supported HTTP methods</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#base-url">Base URL</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#request-construction">Request construction</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#accessing-collections">Accessing collections</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#accessing-entities">Accessing entities</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#issuing-queries">Issuing queries</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#authentication-oauth">Authentication (OAuth)</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#response-format">Response format</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#sdks">SDKs</a></li>
+</ul>
+</li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../user-management/messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>Using the API</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/getting-started/using-the-api.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="using-the-api">
+<h1>Using the API<a class="headerlink" href="#using-the-api" title="Permalink to this headline">¶</a></h1>
+<p>Usergrid uses a pure REST (Representational State Transfer) API built as
+a collection of resources. Resource locations are described by paths
+that are related intrinsically to collections and entities in
+collections.</p>
+<p>This section gives several examples of how to construct API requests. To
+focus on what&#8217;s important, the examples use an abbreviated path that
+starts after the application UUID, or application name. For example,
+instead of giving a fully qualified path name as in:</p>
+<div class="highlight-python"><div class="highlight"><pre>https://api.usergrid.com/your-org/your-app/users
+</pre></div>
+</div>
+<p>the example simply lists this:</p>
+<div class="highlight-python"><div class="highlight"><pre>/users
+</pre></div>
+</div>
+<div class="section" id="supported-http-methods">
+<h2>Supported HTTP methods<a class="headerlink" href="#supported-http-methods" title="Permalink to this headline">¶</a></h2>
+<p>When building a REST API, the challenge is to represent the data and the
+action upon the data as a path to a resource that can be created,
+retrieved, updated, or deleted. The HTTP methods POST, GET, PUT, and
+DELETE correspond to the actions that are applied to resources.</p>
+</div>
+<div class="section" id="base-url">
+<h2>Base URL<a class="headerlink" href="#base-url" title="Permalink to this headline">¶</a></h2>
+<p>The base url for all requests made to Usergrid depends on where you have
+Usergrid installed. If you are using Apigee&#8217;s trial Usergrid service,
+the base URL is <code class="docutils literal"><span class="pre">https://api.usergrid.com.</span></code></p>
+</div>
+<div class="section" id="request-construction">
+<h2>Request construction<a class="headerlink" href="#request-construction" title="Permalink to this headline">¶</a></h2>
+<p>Usergrid interprets the URL resource path as a list of names, UUIDs, or
+queries. The basic path format is:</p>
+<div class="highlight-python"><div class="highlight"><pre>https://api.usergrid.com/&lt;org-uuid|org-name&gt;/&lt;app-uuid|app-name&gt;/&lt;collection-name&gt;/&lt;entity-uuid|entity-name&gt;
+</pre></div>
+</div>
+<p>Note: You cannot mix UUIDs and names in the URL resource path. For
+example, the following is incorrect:</p>
+<div class="highlight-python"><div class="highlight"><pre>https://api.usergrid.com/your-org/62de5d97-d28c-11e1-8d5c-12313b01d5c1/users/john.doe
+</pre></div>
+</div>
+</div>
+<div class="section" id="accessing-collections">
+<h2>Accessing collections<a class="headerlink" href="#accessing-collections" title="Permalink to this headline">¶</a></h2>
+<p>To access all entities in a collection, specify the path as follows:</p>
+<div class="highlight-python"><div class="highlight"><pre>/users
+</pre></div>
+</div>
+<p>Such a request retrieves the first 10 entities in the collection /users
+sorted by their entity UUID.</p>
+</div>
+<div class="section" id="accessing-entities">
+<h2>Accessing entities<a class="headerlink" href="#accessing-entities" title="Permalink to this headline">¶</a></h2>
+<p>To access an entity in a collection, specify the path as follows:</p>
+<div class="highlight-python"><div class="highlight"><pre>/&lt;collection&gt;/&lt;uuid|name&gt;
+</pre></div>
+</div>
+<p>where <code class="docutils literal"><span class="pre">&lt;collection&gt;</span></code> is the collection name, and is the entity’s uuid
+or name.</p>
+<p>To access a user in the users collection, specify the path as follows:</p>
+<div class="highlight-python"><div class="highlight"><pre>/users/&lt;uuid|username|email_address&gt;
+</pre></div>
+</div>
+<p>where <code class="docutils literal"><span class="pre">&lt;uuid|username|email_address&gt;</span></code> is the user’s uuid, username, or
+email address.</p>
+<p>For example, the following request retrieves the entity named dino from
+the dogs collection:</p>
+<div class="highlight-python"><div class="highlight"><pre>/dogs/dino
+</pre></div>
+</div>
+</div>
+<div class="section" id="issuing-queries">
+<h2>Issuing queries<a class="headerlink" href="#issuing-queries" title="Permalink to this headline">¶</a></h2>
+<p>You can issue a query in an API request that retrieves items from a
+collection. Here is the typical format for queries:</p>
+<div class="highlight-python"><div class="highlight"><pre>/&lt;collection&gt;?ql=&lt;query&gt;
+</pre></div>
+</div>
+<p>where is a query in the query language.</p>
+<p>For example, this request retrieves users whose Facebook first name is
+john:</p>
+<div class="highlight-python"><div class="highlight"><pre>/users?ql=select * where facebook.first_name =&#39;john&#39;
+</pre></div>
+</div>
+<p>For further information about queries, see Queries and parameters.</p>
+</div>
+<div class="section" id="authentication-oauth">
+<h2>Authentication (OAuth)<a class="headerlink" href="#authentication-oauth" title="Permalink to this headline">¶</a></h2>
+<p>Usergrid implements the OAuth 2.0 standard for authenticating users,
+clients and API requests.</p>
+<p>Generally, you will generate a token for every user of your app by
+providing the user&#8217;s username and password. The token can then be sent
+with all API requests to ensure each user is only able to access and
+modify the resources you have granted them rights to.</p>
+<p>Note that by default access tokens are not needed to make requests to
+the default sandbox application in an organization.</p>
+<p>For more information on generating and using access tokens, see
+Authenticating users and application clients and Authenticating API
+requests.</p>
+</div>
+<div class="section" id="response-format">
+<h2>Response format<a class="headerlink" href="#response-format" title="Permalink to this headline">¶</a></h2>
+<p>All API methods return a response object that typically contains an
+array of entities:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+  <span class="s">&quot;entities&quot;</span> <span class="p">:</span> <span class="p">[</span>
+    <span class="o">...</span>
+  <span class="p">]</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+<p>Not everything can be included inside the entity, and some of the data
+that gets associated with specific entities isn&#8217;t part of their
+persistent representation. This is metadata, and it can be part of the
+response as well as associated with a specific entity. Metadata is just
+an arbitrary key/value JSON structure.</p>
+<p>For example:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+  <span class="s">&quot;entities&quot;</span> <span class="p">:</span> <span class="p">{</span>
+    <span class="p">{</span>
+      <span class="s">&quot;name&quot;</span> <span class="p">:</span> <span class="s">&quot;ed&quot;</span><span class="p">,</span>
+      <span class="s">&quot;metadata&quot;</span> <span class="p">:</span> <span class="p">{</span>
+        <span class="s">&quot;collections&quot;</span> <span class="p">:</span> <span class="p">[</span><span class="s">&quot;activities&quot;</span><span class="p">,</span> <span class="s">&quot;groups&quot;</span><span class="p">,</span> <span class="s">&quot;followers&quot;</span><span class="p">]</span>
+      <span class="p">}</span>
+    <span class="p">}</span>
+  <span class="p">},</span>
+  <span class="s">&quot;metadata&quot;</span> <span class="p">:</span> <span class="p">{</span>
+    <span class="s">&quot;foo&quot;</span> <span class="p">:</span> <span class="p">[</span><span class="s">&quot;bar&quot;</span><span class="p">,</span> <span class="s">&quot;baz&quot;</span><span class="p">]</span>
+  <span class="p">}</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+<p>For example, here is the response to a basic GET for a user entity:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+  <span class="s">&quot;action&quot;</span> <span class="p">:</span> <span class="s">&quot;get&quot;</span><span class="p">,</span>
+  <span class="s">&quot;application&quot;</span> <span class="p">:</span> <span class="s">&quot;f34f4222-a166-11e2-a7f7-02e81adcf3d0&quot;</span><span class="p">,</span>
+  <span class="s">&quot;params&quot;</span> <span class="p">:</span> <span class="p">{</span> <span class="p">},</span>
+  <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span class="s">&quot;/users&quot;</span><span class="p">,</span>
+  <span class="s">&quot;uri&quot;</span> <span class="p">:</span> <span class="s">&quot;https://api.usergrid.com/your-org/your-app/users&quot;</span><span class="p">,</span>
+  <span class="s">&quot;entities&quot;</span> <span class="p">:</span> <span class="p">[</span> <span class="p">{</span>
+    <span class="s">&quot;uuid&quot;</span> <span class="p">:</span> <span class="s">&quot;503f17da-ec39-11e3-a0dd-a554b7fbd57a&quot;</span><span class="p">,</span>
+    <span class="s">&quot;type&quot;</span> <span class="p">:</span> <span class="s">&quot;user&quot;</span><span class="p">,</span>
+    <span class="s">&quot;created&quot;</span> <span class="p">:</span> <span class="mi">1401921665485</span><span class="p">,</span>
+    <span class="s">&quot;modified&quot;</span> <span class="p">:</span> <span class="mi">1401921665485</span><span class="p">,</span>
+    <span class="s">&quot;username&quot;</span> <span class="p">:</span> <span class="s">&quot;someUser&quot;</span><span class="p">,</span>
+    <span class="s">&quot;email&quot;</span> <span class="p">:</span> <span class="s">&quot;someUser@yourdomain.com&quot;</span><span class="p">,</span>
+    <span class="s">&quot;activated&quot;</span> <span class="p">:</span> <span class="n">true</span><span class="p">,</span>
+    <span class="s">&quot;picture&quot;</span> <span class="p">:</span> <span class="s">&quot;http://www.gravatar.com/avatar/dc5d478e9c029853fbd025bed0dc51f8&quot;</span><span class="p">,</span>
+    <span class="s">&quot;metadata&quot;</span> <span class="p">:</span> <span class="p">{</span>
+      <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/503f17da-ec39-11e3-a0dd-a554b7fbd57a&quot;</span><span class="p">,</span>
+      <span class="s">&quot;sets&quot;</span> <span class="p">:</span> <span class="p">{</span>
+        <span class="s">&quot;rolenames&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/503f17da-ec39-11e3-a0dd-a554b7fbd57a/roles&quot;</span><span class="p">,</span>
+        <span class="s">&quot;permissions&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/503f17da-ec39-11e3-a0dd-a554b7fbd57a/permissions&quot;</span>
+      <span class="p">},</span>
+      <span class="s">&quot;collections&quot;</span> <span class="p">:</span> <span class="p">{</span>
+        <span class="s">&quot;activities&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/503f17da-ec39-11e3-a0dd-a554b7fbd57a/activities&quot;</span><span class="p">,</span>
+        <span class="s">&quot;devices&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/503f17da-ec39-11e3-a0dd-a554b7fbd57a/devices&quot;</span><span class="p">,</span>
+        <span class="s">&quot;feed&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/503f17da-ec39-11e3-a0dd-a554b7fbd57a/feed&quot;</span><span class="p">,</span>
+        <span class="s">&quot;groups&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/503f17da-ec39-11e3-a0dd-a554b7fbd57a/groups&quot;</span><span class="p">,</span>
+        <span class="s">&quot;roles&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/503f17da-ec39-11e3-a0dd-a554b7fbd57a/roles&quot;</span><span class="p">,</span>
+        <span class="s">&quot;following&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/503f17da-ec39-11e3-a0dd-a554b7fbd57a/following&quot;</span><span class="p">,</span>
+        <span class="s">&quot;followers&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/503f17da-ec39-11e3-a0dd-a554b7fbd57a/followers&quot;</span>
+      <span class="p">}</span>
+    <span class="p">}</span>
+  <span class="p">}</span> <span class="p">],</span>
+  <span class="s">&quot;timestamp&quot;</span> <span class="p">:</span> <span class="mi">1401921673597</span><span class="p">,</span>
+  <span class="s">&quot;duration&quot;</span> <span class="p">:</span> <span class="mi">12</span><span class="p">,</span>
+  <span class="s">&quot;organization&quot;</span> <span class="p">:</span> <span class="s">&quot;your-org&quot;</span><span class="p">,</span>
+  <span class="s">&quot;applicationName&quot;</span> <span class="p">:</span> <span class="s">&quot;your-app&quot;</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="sdks">
+<h2>SDKs<a class="headerlink" href="#sdks" title="Permalink to this headline">¶</a></h2>
+<p>To make the integration of Usergrid features into your application code
+quicker and easier, Usegrid offers SDKs in a variety of languages. The
+SDKs contain language-specific methods that allow you to issue API
+requests from your application code in your preferred language. SDKs are
+available for the following languages:</p>
+<ul class="simple">
+<li>iOS</li>
+<li>Android</li>
+<li>JavaScript/HTML5</li>
+<li>Node.js</li>
+<li>Ruby</li>
+<li>.NET</li>
+</ul>
+<p>For more information, see SDKs.</p>
+</div>
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+      
+        <a href="../data-storage/data-store-dbms.html" class="btn btn-neutral float-right" title="The Usergrid Data Store" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+      
+      
+        <a href="using-a-sandbox-app.html" class="btn btn-neutral" title="Using a Sandbox Application" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+      
+    </div>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

[05/60] [abbrv] incubator-usergrid git commit: cherry picking docs from master

[sn...@apache.org]

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/user-management/group.html
----------------------------------------------------------------------
diff --git a/content/docs/user-management/group.html b/content/docs/user-management/group.html
new file mode 100644
index 0000000..0f2a33d
--- /dev/null
+++ b/content/docs/user-management/group.html
@@ -0,0 +1,824 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>Working with group data &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+        <link rel="next" title="Activity" href="activity.html"/>
+        <link rel="prev" title="Working with User Data" href="working-user-data.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">Working with group data</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#creating-groups">Creating groups</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#request-syntax">Request Syntax</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#request-uri">Request URI</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#example">Example</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#request">Request</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#response">Response</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#retrieving-groups">Retrieving groups</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#id1">Request Syntax</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id2">Request URI</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#parameter-description">Parameter Description</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#id3">Request</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id4">Response</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#retrieving-a-group-s-users">Retrieving a group&#8217;s users</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#id5">Request URI</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#parameters">Parameters</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#example-request">Example - Request</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#example-response">Example - Response</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#deleting-a-group">Deleting a group</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#adding-a-user-to-a-group">Adding a user to a group</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#id6">Request syntax</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id7">Request URI</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id8">Example</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id9">Request</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id10">Response</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#removing-a-user-from-a-group">Removing a user from a group</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#id11">Request syntax</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id12">Example request</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id13">Example response</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>Working with group data</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/user-management/group.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="working-with-group-data">
+<h1>Working with group data<a class="headerlink" href="#working-with-group-data" title="Permalink to this headline">¶</a></h1>
+<p>You can organize app users into groups. Groups have their own Activity
+Feed, their own permissions and be a useful alternative to Roles,
+depending on how you model your data. Groups were originally designed to
+emulate Facebook Groups, so they will tend to function about the same
+way Facebook Groups would.</p>
+<p>Groups are hierarchical. Every member of the group
+<code class="docutils literal"><span class="pre">/groups/california/san-francisco</span></code> is also a member of the group
+<code class="docutils literal"><span class="pre">/groups/california</span></code>.</p>
+<p>Groups are also a great way to model things such a topic subscriptions.
+For example, you could allow people to subscribe (i.e. become a member
+of the group and be alerted via Activities) to
+<code class="docutils literal"><span class="pre">/groups/memes/dogs/doge</span></code> or subscribe to all <code class="docutils literal"><span class="pre">/groups/memes/dogs</span></code>.</p>
+<p>See the <a class="reference external" href="../rest-endpoints/api-docs.html#group">Group Model section of the API
+Reference</a> for a list of the
+system-defined properties for group entities. In addition, you can
+create group properties specific to your application.</p>
+<div class="section" id="creating-groups">
+<h2>Creating groups<a class="headerlink" href="#creating-groups" title="Permalink to this headline">¶</a></h2>
+<p>A group entity represents an application group of users. You can create,
+retrieve, update, delete, and query group entities. See User entity
+properties for a list of the system-defined properties for group
+entities. In addition, you can create group properties specific to your
+application.</p>
+<div class="section" id="request-syntax">
+<h3>Request Syntax<a class="headerlink" href="#request-syntax" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X POST &quot;https://api.usergrid.com/your-org/your-app/groups&quot; &#39;{ request body }&#39;
+</pre></div>
+</div>
+<p>Use the POST method to create a new group. Groups use paths to indicate
+their unique names. This allows you to create group hierarchies by using
+slashes. For this reason, you need to specify a path property for a new
+group.</p>
+</div>
+<div class="section" id="request-uri">
+<h3>Request URI<a class="headerlink" href="#request-uri" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">POST</span> <span class="o">/</span><span class="p">{</span><span class="n">org_id</span><span class="p">}</span><span class="o">/</span><span class="p">{</span><span class="n">app_id</span><span class="p">}</span><span class="o">/</span><span class="n">groups</span>
+</pre></div>
+</div>
+<p>Parameters</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="22%" />
+<col width="78%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>uuid | org_id</td>
+<td>Organization UUID or organization name</td>
+</tr>
+<tr class="row-odd"><td>uuid | app_id</td>
+<td>Application UUID or application name</td>
+</tr>
+<tr class="row-even"><td>request body</td>
+<td>One or more sets of group properties of which path is mandatory.</td>
+</tr>
+</tbody>
+</table>
+<p>The <code class="docutils literal"><span class="pre">path</span></code> property is required and must be unique, it may include
+forward slashes to denote hierarchical relationships.</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+    <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span class="s">&quot;somegroup/somesubgroup&quot;</span><span class="p">,</span>
+    <span class="s">&quot;title&quot;</span> <span class="p">:</span> <span class="s">&quot;Some SubGroup&quot;</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="example">
+<h3>Example<a class="headerlink" href="#example" title="Permalink to this headline">¶</a></h3>
+<p><strong>Note</strong>: Although not shown in the API examples below, you need to
+provide a valid access token with each API call. See Authenticating
+users and application clients for details.</p>
+</div>
+<div class="section" id="request">
+<h3>Request<a class="headerlink" href="#request" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X POST &quot;https://api.usergrid.com/my-org/my-app/groups&quot; -d &#39;{&quot;path&quot;:&quot;mynewgroup&quot;}&#39;
+</pre></div>
+</div>
+</div>
+<div class="section" id="response">
+<h3>Response<a class="headerlink" href="#response" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+    <span class="s">&quot;action&quot;</span><span class="p">:</span> <span class="s">&quot;post&quot;</span><span class="p">,</span>
+    <span class="s">&quot;application&quot;</span><span class="p">:</span> <span class="s">&quot;7fb8d891-477d-11e1-b2bd-22000a1c4e22&quot;</span><span class="p">,</span>
+    <span class="s">&quot;params&quot;</span><span class="p">:</span> <span class="p">{},</span>
+    <span class="s">&quot;path&quot;</span><span class="p">:</span> <span class="s">&quot;/groups&quot;</span><span class="p">,</span>
+    <span class="s">&quot;uri&quot;</span><span class="p">:</span> <span class="s">&quot;https://api.usergrid.com/22000a1c4e22-7fb8d891-477d-11e1-b2bd/7fb8d891-477d-11e1-b2bd-22000a1c4e22/groups&quot;</span><span class="p">,</span>
+    <span class="s">&quot;entities&quot;</span><span class="p">:</span> <span class="p">[{</span>
+        <span class="s">&quot;uuid&quot;</span><span class="p">:</span> <span class="s">&quot;a668717b-67cb-11e1-8223-12313d14bde7&quot;</span><span class="p">,</span>
+        <span class="s">&quot;type&quot;</span><span class="p">:</span> <span class="s">&quot;group&quot;</span><span class="p">,</span>
+        <span class="s">&quot;created&quot;</span><span class="p">:</span> <span class="mi">1331066016571</span><span class="p">,</span>
+        <span class="s">&quot;modified&quot;</span><span class="p">:</span> <span class="mi">1331066016571</span><span class="p">,</span>
+        <span class="s">&quot;metadata&quot;</span><span class="p">:</span> <span class="p">{</span>
+            <span class="s">&quot;path&quot;</span><span class="p">:</span> <span class="s">&quot;/groups/a668717b-67cb-11e1-8223-12313d14bde7&quot;</span><span class="p">,</span>
+            <span class="s">&quot;sets&quot;</span><span class="p">:</span> <span class="p">{</span>
+                <span class="s">&quot;rolenames&quot;</span><span class="p">:</span> <span class="s">&quot;/groups/a668717b-67cb-11e1-8223-12313d14bde7/rolenames&quot;</span><span class="p">,</span>
+                <span class="s">&quot;permissions&quot;</span><span class="p">:</span> <span class="s">&quot;/groups/a668717b-67cb-11e1-8223-12313d14bde7/permissions&quot;</span>
+            <span class="p">},</span>
+            <span class="s">&quot;collections&quot;</span><span class="p">:</span> <span class="p">{</span>
+                <span class="s">&quot;activities&quot;</span><span class="p">:</span> <span class="s">&quot;/groups/a668717b-67cb-11e1-8223-12313d14bde7/activities&quot;</span><span class="p">,</span>
+                <span class="s">&quot;feed&quot;</span><span class="p">:</span> <span class="s">&quot;/groups/a668717b-67cb-11e1-8223-12313d14bde7/feed&quot;</span><span class="p">,</span>
+                <span class="s">&quot;roles&quot;</span><span class="p">:</span> <span class="s">&quot;/groups/a668717b-67cb-11e1-8223-12313d14bde7/roles&quot;</span><span class="p">,</span>
+                <span class="s">&quot;users&quot;</span><span class="p">:</span> <span class="s">&quot;/groups/a668717b-67cb-11e1-8223-12313d14bde7/users&quot;</span>
+            <span class="p">}</span>
+        <span class="p">},</span>
+        <span class="s">&quot;path&quot;</span><span class="p">:</span> <span class="s">&quot;mynewgroup&quot;</span>
+    <span class="p">}],</span>
+    <span class="s">&quot;timestamp&quot;</span><span class="p">:</span> <span class="mi">1331066016563</span><span class="p">,</span>
+    <span class="s">&quot;duration&quot;</span><span class="p">:</span> <span class="mi">35</span><span class="p">,</span>
+    <span class="s">&quot;organization&quot;</span><span class="p">:</span> <span class="s">&quot;my-org&quot;</span><span class="p">,</span>
+    <span class="s">&quot;applicationName&quot;</span><span class="p">:</span> <span class="s">&quot;my-app&quot;</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+</div>
+<div class="section" id="retrieving-groups">
+<h2>Retrieving groups<a class="headerlink" href="#retrieving-groups" title="Permalink to this headline">¶</a></h2>
+<p>Retrieving group data</p>
+<p>You can retrieve data about groups through cURL or one of the SDKs. Each
+provides a way to filter the list of groups by data associated with the
+group, such as title or path, or other properties in the group entity.</p>
+<p>See the <a class="reference external" href="../rest-endpoints/api-docs.html#group">Group Model section of the API
+Reference</a> for a list of the
+system-defined properties for group entities. In addition, you can
+create group properties specific to your application.</p>
+<div class="section" id="id1">
+<h3>Request Syntax<a class="headerlink" href="#id1" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X GET &quot;https://api.usergrid.com/my-org/my-app/groups/mynewgroup&quot;
+</pre></div>
+</div>
+<p>Use the GET method to retrieve group data.</p>
+</div>
+<div class="section" id="id2">
+<h3>Request URI<a class="headerlink" href="#id2" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>GET /&lt;org_id | uuid&gt;/&lt;app_id | uuid&gt;/groups&lt;/groupPath | uuid&gt; | &lt;?ql=query_string&gt;
+</pre></div>
+</div>
+<p>Parameters</p>
+</div>
+</div>
+<div class="section" id="parameter-description">
+<h2>Parameter Description<a class="headerlink" href="#parameter-description" title="Permalink to this headline">¶</a></h2>
+<p>org_id | uuid Organization UUID or organization name app_id | uuid
+Application UUID or application name groupPath | uuid Group UUID or
+group path, which must be unique. query_string A data store query. For
+more on queries, see Data queries.</p>
+<div class="section" id="id3">
+<h3>Request<a class="headerlink" href="#id3" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre># Get a group by the group path, &quot;employees/managers&quot;.
+curl -X GET &quot;https://api.usergrid.com/my-org/my-app/groups/employees/managers&quot;
+
+# Get a group by UUID.
+curl -X GET &quot;https://api.usergrid.com/my-org/my-app/groups/a407b1e7-58e8-11e1-ac46-22000a1c5a67e&quot;
+
+# Get group data filtering by their title.
+curl -X GET &quot;https://api.usergrid.com/my-org/my-app/groups?ql=select%20*%20where%20title%3D&#39;Management%20Employees&#39;&quot;
+</pre></div>
+</div>
+</div>
+<div class="section" id="id4">
+<h3>Response<a class="headerlink" href="#id4" title="Permalink to this headline">¶</a></h3>
+<p>The following is an example of JSON returned by a query for a single
+group.</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+    <span class="s">&quot;action&quot;</span> <span class="p">:</span> <span class="s">&quot;get&quot;</span><span class="p">,</span>
+    <span class="s">&quot;application&quot;</span> <span class="p">:</span> <span class="s">&quot;db1e60a0-417f-11e3-9586-0f1ff3650d20&quot;</span><span class="p">,</span>
+    <span class="s">&quot;params&quot;</span> <span class="p">:</span> <span class="p">{</span> <span class="p">},</span>
+    <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span class="s">&quot;/groups&quot;</span><span class="p">,</span>
+    <span class="s">&quot;uri&quot;</span> <span class="p">:</span> <span class="s">&quot;https://api.usergrid.com/steventraut/mynewapp/groups&quot;</span><span class="p">,</span>
+    <span class="s">&quot;entities&quot;</span> <span class="p">:</span> <span class="p">[</span> <span class="p">{</span>
+        <span class="s">&quot;uuid&quot;</span> <span class="p">:</span> <span class="s">&quot;5005a0fa-6916-11e3-9c1b-b77ec8addc0d&quot;</span><span class="p">,</span>
+        <span class="s">&quot;type&quot;</span> <span class="p">:</span> <span class="s">&quot;group&quot;</span><span class="p">,</span>
+        <span class="s">&quot;created&quot;</span> <span class="p">:</span> <span class="mi">1387503030399</span><span class="p">,</span>
+        <span class="s">&quot;modified&quot;</span> <span class="p">:</span> <span class="mi">1387503030399</span><span class="p">,</span>
+        <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span class="s">&quot;managers&quot;</span><span class="p">,</span>
+        <span class="s">&quot;metadata&quot;</span> <span class="p">:</span> <span class="p">{</span>
+            <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span class="s">&quot;/groups/5005a0fa-6916-11e3-9c1b-b77ec8addc0d&quot;</span><span class="p">,</span>
+            <span class="s">&quot;sets&quot;</span> <span class="p">:</span> <span class="p">{</span>
+                <span class="s">&quot;rolenames&quot;</span> <span class="p">:</span> <span class="s">&quot;/groups/5005a0fa-6916-11e3-9c1b-b77ec8addc0d/roles&quot;</span><span class="p">,</span>
+                <span class="s">&quot;permissions&quot;</span> <span class="p">:</span> <span class="s">&quot;/groups/5005a0fa-6916-11e3-9c1b-b77ec8addc0d/permissions&quot;</span>
+            <span class="p">},</span>
+            <span class="s">&quot;collections&quot;</span> <span class="p">:</span> <span class="p">{</span>
+                <span class="s">&quot;activities&quot;</span> <span class="p">:</span> <span class="s">&quot;/groups/5005a0fa-6916-11e3-9c1b-b77ec8addc0d/activities&quot;</span><span class="p">,</span>
+                <span class="s">&quot;feed&quot;</span> <span class="p">:</span> <span class="s">&quot;/groups/5005a0fa-6916-11e3-9c1b-b77ec8addc0d/feed&quot;</span><span class="p">,</span>
+                <span class="s">&quot;roles&quot;</span> <span class="p">:</span> <span class="s">&quot;/groups/5005a0fa-6916-11e3-9c1b-b77ec8addc0d/roles&quot;</span><span class="p">,</span>
+                <span class="s">&quot;users&quot;</span> <span class="p">:</span> <span class="s">&quot;/groups/5005a0fa-6916-11e3-9c1b-b77ec8addc0d/users&quot;</span>
+            <span class="p">}</span>
+        <span class="p">},</span>
+        <span class="s">&quot;title&quot;</span> <span class="p">:</span> <span class="s">&quot;Management Employees&quot;</span>
+    <span class="p">}</span> <span class="p">],</span>
+    <span class="s">&quot;timestamp&quot;</span> <span class="p">:</span> <span class="mi">1391020491701</span><span class="p">,</span>
+    <span class="s">&quot;duration&quot;</span> <span class="p">:</span> <span class="mi">15</span><span class="p">,</span>
+    <span class="s">&quot;organization&quot;</span> <span class="p">:</span> <span class="s">&quot;my-org&quot;</span><span class="p">,</span>
+    <span class="s">&quot;applicationName&quot;</span> <span class="p">:</span> <span class="s">&quot;my-app&quot;</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+</div>
+<div class="section" id="retrieving-a-group-s-users">
+<h2>Retrieving a group&#8217;s users<a class="headerlink" href="#retrieving-a-group-s-users" title="Permalink to this headline">¶</a></h2>
+<p>Use the GET method to retrieve all the users in a group.</p>
+<div class="section" id="id5">
+<h3>Request URI<a class="headerlink" href="#id5" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">GET</span> <span class="o">/</span><span class="p">{</span><span class="n">org_id</span><span class="p">}</span><span class="o">/</span><span class="p">{</span><span class="n">app_id</span><span class="p">}</span><span class="o">/</span><span class="n">groups</span><span class="o">/</span><span class="p">{</span><span class="n">uuid</span><span class="o">|</span><span class="n">groupname</span><span class="p">}</span><span class="o">/</span><span class="n">users</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="parameters">
+<h3>Parameters<a class="headerlink" href="#parameters" title="Permalink to this headline">¶</a></h3>
+<table border="1" class="docutils">
+<colgroup>
+<col width="42%" />
+<col width="58%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>arg uuid|string org_id</td>
+<td>Organization UUID or organization name</td>
+</tr>
+<tr class="row-odd"><td>arg uuid|string app_id</td>
+<td>Application UUID or application name</td>
+</tr>
+<tr class="row-even"><td>arg uuid|string groupname</td>
+<td>UUID or name of the group</td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="section" id="example-request">
+<h3>Example - Request<a class="headerlink" href="#example-request" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X GET &quot;https://api.usergrid.com/my-org/my-app/groups/mygroup/users&quot;
+</pre></div>
+</div>
+</div>
+<div class="section" id="example-response">
+<h3>Example - Response<a class="headerlink" href="#example-response" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+  <span class="s">&quot;action&quot;</span> <span class="p">:</span> <span class="s">&quot;get&quot;</span><span class="p">,</span>
+  <span class="s">&quot;application&quot;</span> <span class="p">:</span> <span class="s">&quot;e7127751-6985-11e2-8078-02e81aeb2129&quot;</span><span class="p">,</span>
+  <span class="s">&quot;params&quot;</span> <span class="p">:</span> <span class="p">{</span> <span class="p">},</span>
+  <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span class="s">&quot;/groups/d20976ff-802f-11e2-b690-02e81ae66238/users&quot;</span><span class="p">,</span>
+  <span class="s">&quot;uri&quot;</span> <span class="p">:</span> <span class="s">&quot;http://api.usergrid.com/myorg/sandbox/groups/d20976ff-802f-11e2-b690-02e81ae61238/users&quot;</span><span class="p">,</span>
+  <span class="s">&quot;entities&quot;</span> <span class="p">:</span> <span class="p">[</span> <span class="p">{</span>
+    <span class="s">&quot;uuid&quot;</span> <span class="p">:</span> <span class="s">&quot;cd789b00-698b-11e2-a6e3-02e81ae236e9&quot;</span><span class="p">,</span>
+    <span class="s">&quot;type&quot;</span> <span class="p">:</span> <span class="s">&quot;user&quot;</span><span class="p">,</span>
+    <span class="s">&quot;name&quot;</span> <span class="p">:</span> <span class="s">&quot;barney&quot;</span><span class="p">,</span>
+    <span class="s">&quot;created&quot;</span> <span class="p">:</span> <span class="mi">1359405994314</span><span class="p">,</span>
+    <span class="s">&quot;modified&quot;</span> <span class="p">:</span> <span class="mi">1361894320470</span><span class="p">,</span>
+    <span class="s">&quot;activated&quot;</span> <span class="p">:</span> <span class="n">true</span><span class="p">,</span>
+    <span class="s">&quot;email&quot;</span> <span class="p">:</span> <span class="s">&quot;barney@apigee.com&quot;</span><span class="p">,</span>
+    <span class="s">&quot;metadata&quot;</span> <span class="p">:</span> <span class="p">{</span>
+      <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span class="s">&quot;/groups/d20976ff-802f-11e2-b690-02e81ae66238/users/cd789b00-698b-11e2-a6e3-02e81aeb26e9&quot;</span><span class="p">,</span>
+      <span class="s">&quot;sets&quot;</span> <span class="p">:</span> <span class="p">{</span>
+        <span class="s">&quot;rolenames&quot;</span> <span class="p">:</span> <span class="s">&quot;/groups/d20976ff-802f-11e2-b690-02e81ae66238/users/cd789b00-698b-11e2-a6e3-02e81aeb26e9/rolenames&quot;</span><span class="p">,</span>
+        <span class="s">&quot;permissions&quot;</span> <span class="p">:</span> <span class="s">&quot;/groups/d20976ff-802f-11e2-b690-02e81ae66238/users/cd789b00-698b-11e2-a6e3-02e81aeb26e9/permissions&quot;</span>
+      <span class="p">},</span>
+      <span class="s">&quot;collections&quot;</span> <span class="p">:</span> <span class="p">{</span>
+        <span class="s">&quot;activities&quot;</span> <span class="p">:</span> <span class="s">&quot;/groups/d20976ff-802f-11e2-b690-02e81ae66238/users/cd789b00-698b-11e2-a6e3-02e81aeb26e9/activities&quot;</span><span class="p">,</span>
+        <span class="s">&quot;devices&quot;</span> <span class="p">:</span> <span class="s">&quot;/groups/d20976ff-802f-11e2-b690-02e81ae66238/users/cd789b00-698b-11e2-a6e3-02e81aeb26e9/devices&quot;</span><span class="p">,</span>
+        <span class="s">&quot;feed&quot;</span> <span class="p">:</span> <span class="s">&quot;/groups/d20976ff-802f-11e2-b690-02e81ae66238/users/cd789b00-698b-11e2-a6e3-02e81aeb26e9/feed&quot;</span><span class="p">,</span>
+        <span class="s">&quot;groups&quot;</span> <span class="p">:</span> <span class="s">&quot;/groups/d20976ff-802f-11e2-b690-02e81ae66238/users/cd789b00-698b-11e2-a6e3-02e81aeb26e9/groups&quot;</span><span class="p">,</span>
+        <span class="s">&quot;roles&quot;</span> <span class="p">:</span> <span class="s">&quot;/groups/d20976ff-802f-11e2-b690-02e81ae66238/users/cd789b00-698b-11e2-a6e3-02e81aeb26e9/roles&quot;</span><span class="p">,</span>
+        <span class="s">&quot;following&quot;</span> <span class="p">:</span> <span class="s">&quot;/groups/d20976ff-802f-11e2-b690-02e81ae66238/users/cd789b00-698b-11e2-a6e3-02e81aeb26e9/following&quot;</span><span class="p">,</span>
+        <span class="s">&quot;followers&quot;</span> <span class="p">:</span> <span class="s">&quot;/groups/d20976ff-802f-11e2-b690-02e81ae66238/users/cd789b00-698b-11e2-a6e3-02e81aeb26e9/followers&quot;</span>
+      <span class="p">}</span>
+    <span class="p">},</span>
+    <span class="s">&quot;name&quot;</span> <span class="p">:</span> <span class="s">&quot;barney&quot;</span><span class="p">,</span>
+    <span class="s">&quot;picture&quot;</span> <span class="p">:</span> <span class="s">&quot;http://www.gravatar.com/avatar/00767101f6b4f2cf5d02ed510dbcf0b4&quot;</span><span class="p">,</span>
+    <span class="s">&quot;test&quot;</span> <span class="p">:</span> <span class="s">&quot;fred&quot;</span><span class="p">,</span>
+    <span class="s">&quot;username&quot;</span> <span class="p">:</span> <span class="s">&quot;barney&quot;</span>
+  <span class="p">}</span> <span class="p">],</span>
+  <span class="s">&quot;timestamp&quot;</span> <span class="p">:</span> <span class="mi">1361903248398</span><span class="p">,</span>
+  <span class="s">&quot;duration&quot;</span> <span class="p">:</span> <span class="mi">24</span><span class="p">,</span>
+  <span class="s">&quot;organization&quot;</span> <span class="p">:</span> <span class="s">&quot;myorg&quot;</span><span class="p">,</span>
+  <span class="s">&quot;applicationName&quot;</span> <span class="p">:</span> <span class="s">&quot;sandbox&quot;</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+</div>
+<div class="section" id="deleting-a-group">
+<h2>Deleting a group<a class="headerlink" href="#deleting-a-group" title="Permalink to this headline">¶</a></h2>
+<p>To delete a group, delete the associated group entity as you would any
+other entity. Note that this will only delete the group. Any entities in
+the group will be preserved.</p>
+<p>For more information and code samples, see <a class="reference external" href="../data-storage/entities.html#deleting-data-entities">Deleting Data
+Entities</a>.</p>
+</div>
+<div class="section" id="adding-a-user-to-a-group">
+<h2>Adding a user to a group<a class="headerlink" href="#adding-a-user-to-a-group" title="Permalink to this headline">¶</a></h2>
+<p>See all application entities</p>
+<p>You can add users to groups from client code using cURL commands or one
+of the SDKs, as described here.</p>
+<p>When setting up your application on the server, you might find it easier
+and more convenient to create and populate groups with the admin portal.
+There, you can create groups, create roles, and define permission rules
+that govern user access to data and services in your application. For
+more information, see Security &amp; token authentication.</p>
+<p>Use the POST method to add a user to a group. If the named group does
+not yet exist, an error message is returned.</p>
+<div class="section" id="id6">
+<h3>Request syntax<a class="headerlink" href="#id6" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X POST https://api.usergrid.com/&lt;org_id&gt;/&lt;app_id&gt;/groups/&lt;uuid | groupname&gt;/users/&lt;uuid | username&gt;
+</pre></div>
+</div>
+</div>
+<div class="section" id="id7">
+<h3>Request URI<a class="headerlink" href="#id7" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>POST /&lt;org_id&gt;/&lt;app_id&gt;/groups/&lt;uuid | groupname&gt;/users/&lt;uuid | username&gt;
+</pre></div>
+</div>
+<p>Parameters</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="43%" />
+<col width="57%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>arg uuid | string org_id</td>
+<td>Organization UUID or organization name</td>
+</tr>
+<tr class="row-odd"><td>arg uuid | string app_id</td>
+<td>Application UUID or application name</td>
+</tr>
+<tr class="row-even"><td>arg uuid | string groupname</td>
+<td>UUID or name of the group</td>
+</tr>
+<tr class="row-odd"><td>arg uuid | string username</td>
+<td>UUID or username of user</td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="section" id="id8">
+<h3>Example<a class="headerlink" href="#id8" title="Permalink to this headline">¶</a></h3>
+<p><strong>Note</strong>: Although not shown in the API examples below, you need to
+provide a valid access token with each API call. See Authenticating
+users and application clients for details.</p>
+</div>
+<div class="section" id="id9">
+<h3>Request<a class="headerlink" href="#id9" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X POST &quot;https://api.usergrid.com/my-org/my-app/groups/mynewgroup/users/john.doe&quot;
+</pre></div>
+</div>
+</div>
+<div class="section" id="id10">
+<h3>Response<a class="headerlink" href="#id10" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+    <span class="s">&quot;action&quot;</span><span class="p">:</span> <span class="s">&quot;post&quot;</span><span class="p">,</span>
+    <span class="s">&quot;application&quot;</span><span class="p">:</span> <span class="s">&quot;7fb8d891-477d-11e1-b2bd-22000a1c4e22&quot;</span><span class="p">,</span>
+    <span class="s">&quot;params&quot;</span><span class="p">:</span> <span class="p">{},</span>
+    <span class="s">&quot;path&quot;</span><span class="p">:</span> <span class="s">&quot;/groups/a668717b-67cb-11e1-8223-12313d14bde7/users&quot;</span><span class="p">,</span>
+    <span class="s">&quot;uri&quot;</span><span class="p">:</span> <span class="s">&quot;https://api.usergrid.com/22000a1c4e22-7fb8d891-477d-11e1-b2bd/7fb8d891-477d-11e1-b2bd-22000a1c4e22/groups/a668717b-67cb-11e1-8223-12313d14bde7/users&quot;</span><span class="p">,</span>
+    <span class="s">&quot;entities&quot;</span><span class="p">:</span> <span class="p">[{</span>
+        <span class="s">&quot;uuid&quot;</span><span class="p">:</span> <span class="s">&quot;6fbc8157-4786-11e1-b2bd-22000a1c4e22&quot;</span><span class="p">,</span>
+        <span class="s">&quot;type&quot;</span><span class="p">:</span> <span class="s">&quot;user&quot;</span><span class="p">,</span>
+        <span class="s">&quot;name&quot;</span><span class="p">:</span> <span class="s">&quot;John Doe&quot;</span><span class="p">,</span>
+        <span class="s">&quot;created&quot;</span><span class="p">:</span> <span class="mi">1327517852364015</span><span class="p">,</span>
+        <span class="s">&quot;modified&quot;</span><span class="p">:</span> <span class="mi">1327517852364015</span><span class="p">,</span>
+        <span class="s">&quot;activated&quot;</span><span class="p">:</span> <span class="n">true</span><span class="p">,</span>
+        <span class="s">&quot;email&quot;</span><span class="p">:</span> <span class="s">&quot;john.doe@mail.com&quot;</span><span class="p">,</span>
+        <span class="s">&quot;metadata&quot;</span><span class="p">:</span> <span class="p">{</span>
+            <span class="s">&quot;connecting&quot;</span><span class="p">:</span> <span class="p">{</span>
+                <span class="s">&quot;owners&quot;</span><span class="p">:</span><span class="s">&quot;/groups/a668717b-67cb-11e1-8223-12313d14bde7/users/6fbc8157-4786-11e1-b2bd-22000a1c4e22/connecting/owners&quot;</span>
+            <span class="p">},</span>
+            <span class="s">&quot;path&quot;</span><span class="p">:</span> <span class="s">&quot;/groups/a668717b-67cb-11e1-8223-12313d14bde7/users/6fbc8157-4786-11e1-b2bd-22000a1c4e22&quot;</span><span class="p">,</span>
+            <span class="s">&quot;sets&quot;</span><span class="p">:</span> <span class="p">{</span>
+                <span class="s">&quot;rolenames&quot;</span><span class="p">:</span> <span class="s">&quot;/groups/a668717b-67cb-11e1-8223-12313d14bde7/users/6fbc8157-4786-11e1-b2bd-22000a1c4e22/rolenames&quot;</span><span class="p">,</span>
+                <span class="s">&quot;permissions&quot;</span><span class="p">:</span> <span class="s">&quot;/groups/a668717b-67cb-11e1-8223-12313d14bde7/users/6fbc8157-4786-11e1-b2bd-22000a1c4e22/permissions&quot;</span>
+            <span class="p">},</span>
+            <span class="s">&quot;collections&quot;</span><span class="p">:{</span>
+                <span class="s">&quot;activities&quot;</span><span class="p">:</span><span class="s">&quot;/groups/a668717b-67cb-11e1-8223-12313d14bde7/users/6fbc8157-4786-11e1-b2bd-22000a1c4e22/activities&quot;</span><span class="p">,</span>
+                <span class="s">&quot;devices&quot;</span><span class="p">:</span> <span class="s">&quot;/groups/a668717b-67cb-11e1-8223-12313d14bde7/users/6fbc8157-4786-11e1-b2bd-22000a1c4e22/devices&quot;</span><span class="p">,</span>
+                <span class="s">&quot;feed&quot;</span><span class="p">:</span><span class="s">&quot;/groups/a668717b-67cb-11e1-8223-12313d14bde7/users/6fbc8157-4786-11e1-b2bd-22000a1c4e22/feed&quot;</span><span class="p">,</span>
+                <span class="s">&quot;groups&quot;</span><span class="p">:</span> <span class="s">&quot;/groups/a668717b-67cb-11e1-8223-12313d14bde7/users/6fbc8157-4786-11e1-b2bd-22000a1c4e22/groups&quot;</span><span class="p">,</span>
+                <span class="s">&quot;roles&quot;</span><span class="p">:</span><span class="s">&quot;/groups/a668717b-67cb-11e1-8223-12313d14bde7/users/6fbc8157-4786-11e1-b2bd-22000a1c4e22/roles&quot;</span><span class="p">,</span>
+                <span class="s">&quot;following&quot;</span><span class="p">:</span> <span class="s">&quot;/groups/a668717b-67cb-11e1-8223-12313d14bde7/users/6fbc8157-4786-11e1-b2bd-22000a1c4e22/following&quot;</span><span class="p">,</span>
+                <span class="s">&quot;followers&quot;</span><span class="p">:</span> <span class="s">&quot;/groups/a668717b-67cb-11e1-8223-12313d14bde7/users/6fbc8157-4786-11e1-b2bd-22000a1c4e22/followers&quot;</span>
+            <span class="p">}</span>
+        <span class="p">},</span>
+        <span class="s">&quot;picture&quot;</span><span class="p">:</span> <span class="s">&quot;https://www.gravatar.com/avatar/90f823ba15655b8cc8e3b4d63377576f&quot;</span><span class="p">,</span>
+        <span class="s">&quot;username&quot;</span><span class="p">:</span> <span class="s">&quot;john.doe&quot;</span>
+    <span class="p">}],</span>
+    <span class="s">&quot;timestamp&quot;</span><span class="p">:</span> <span class="mi">1331066031380</span><span class="p">,</span>
+    <span class="s">&quot;duration&quot;</span><span class="p">:</span> <span class="mi">64</span><span class="p">,</span>
+    <span class="s">&quot;organization&quot;</span> <span class="p">:</span> <span class="s">&quot;my-org&quot;</span><span class="p">,</span>
+    <span class="s">&quot;applicationName&quot;</span><span class="p">:</span> <span class="s">&quot;my-app&quot;</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+</div>
+<div class="section" id="removing-a-user-from-a-group">
+<h2>Removing a user from a group<a class="headerlink" href="#removing-a-user-from-a-group" title="Permalink to this headline">¶</a></h2>
+<p>Use the DELETE method to remove a user from the specified group.</p>
+<div class="section" id="id11">
+<h3>Request syntax<a class="headerlink" href="#id11" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X DELETE https://api.usergrid.com/&lt;org&gt;/&lt;app&gt;/groups/&lt;group&gt;/users/&lt;user&gt;&quot;
+</pre></div>
+</div>
+<p>Parameters</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="21%" />
+<col width="79%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>org</td>
+<td>Organization UUID or organization name</td>
+</tr>
+<tr class="row-odd"><td>app</td>
+<td>Application UUID or application name</td>
+</tr>
+<tr class="row-even"><td>group</td>
+<td>UUID or name of the group</td>
+</tr>
+<tr class="row-odd"><td>user</td>
+<td>UUID, username or email of user to be deleted</td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="section" id="id12">
+<h3>Example request<a class="headerlink" href="#id12" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X DELETE https://api.usergrid.com/your-org/your-app/groups/someGroup/users/someUser
+</pre></div>
+</div>
+</div>
+<div class="section" id="id13">
+<h3>Example response<a class="headerlink" href="#id13" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+  <span class="s">&quot;action&quot;</span> <span class="p">:</span> <span class="s">&quot;delete&quot;</span><span class="p">,</span>
+  <span class="s">&quot;application&quot;</span> <span class="p">:</span> <span class="s">&quot;f34f4222-a166-11e2-a7f7-02e81adcf3d0&quot;</span><span class="p">,</span>
+  <span class="s">&quot;params&quot;</span> <span class="p">:</span> <span class="p">{</span> <span class="p">},</span>
+  <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span class="s">&quot;/groups/cd796d0a-b90c-11e3-83de-83ceb9965c26/users&quot;</span><span class="p">,</span>
+  <span class="s">&quot;uri&quot;</span> <span class="p">:</span> <span class="s">&quot;https://api.usergrid.com/your-org/your-app/groups/cd796d0a-b90c-11e3-83de-83ceb9965c26/users&quot;</span><span class="p">,</span>
+  <span class="s">&quot;entities&quot;</span> <span class="p">:</span> <span class="p">[</span> <span class="p">{</span>
+    <span class="s">&quot;uuid&quot;</span> <span class="p">:</span> <span class="s">&quot;74d2d7da-e694-11e3-b0c6-4d2664c8e0c3&quot;</span><span class="p">,</span>
+    <span class="s">&quot;type&quot;</span> <span class="p">:</span> <span class="s">&quot;user&quot;</span><span class="p">,</span>
+    <span class="s">&quot;name&quot;</span> <span class="p">:</span> <span class="s">&quot;someUser&quot;</span><span class="p">,</span>
+    <span class="s">&quot;created&quot;</span> <span class="p">:</span> <span class="mi">1401301104077</span><span class="p">,</span>
+    <span class="s">&quot;modified&quot;</span> <span class="p">:</span> <span class="mi">1401301104077</span><span class="p">,</span>
+    <span class="s">&quot;username&quot;</span> <span class="p">:</span> <span class="s">&quot;someUser&quot;</span><span class="p">,</span>
+    <span class="s">&quot;email&quot;</span> <span class="p">:</span> <span class="s">&quot;your-org@apigee.com&quot;</span><span class="p">,</span>
+    <span class="s">&quot;activated&quot;</span> <span class="p">:</span> <span class="n">true</span><span class="p">,</span>
+    <span class="s">&quot;picture&quot;</span> <span class="p">:</span> <span class="s">&quot;http://www.gravatar.com/avatar/0455fc92de2636fc7a176cc5d298bb78&quot;</span><span class="p">,</span>
+    <span class="s">&quot;metadata&quot;</span> <span class="p">:</span> <span class="p">{</span>
+      <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span class="s">&quot;/groups/cd796d0a-b90c-11e3-83de-83ceb9965c26/users/74d2d7da-e694-11e3-b0c6-4d2664c8e0c3&quot;</span><span class="p">,</span>
+      <span class="s">&quot;sets&quot;</span> <span class="p">:</span> <span class="p">{</span>
+        <span class="s">&quot;rolenames&quot;</span> <span class="p">:</span> <span class="s">&quot;/groups/cd796d0a-b90c-11e3-83de-83ceb9965c26/users/74d2d7da-e694-11e3-b0c6-4d2664c8e0c3/roles&quot;</span><span class="p">,</span>
+        <span class="s">&quot;permissions&quot;</span> <span class="p">:</span> <span class="s">&quot;/groups/cd796d0a-b90c-11e3-83de-83ceb9965c26/users/74d2d7da-e694-11e3-b0c6-4d2664c8e0c3/permissions&quot;</span>
+      <span class="p">},</span>
+      <span class="s">&quot;collections&quot;</span> <span class="p">:</span> <span class="p">{</span>
+        <span class="s">&quot;activities&quot;</span> <span class="p">:</span> <span class="s">&quot;/groups/cd796d0a-b90c-11e3-83de-83ceb9965c26/users/74d2d7da-e694-11e3-b0c6-4d2664c8e0c3/activities&quot;</span><span class="p">,</span>
+        <span class="s">&quot;devices&quot;</span> <span class="p">:</span> <span class="s">&quot;/groups/cd796d0a-b90c-11e3-83de-83ceb9965c26/users/74d2d7da-e694-11e3-b0c6-4d2664c8e0c3/devices&quot;</span><span class="p">,</span>
+        <span class="s">&quot;feed&quot;</span> <span class="p">:</span> <span class="s">&quot;/groups/cd796d0a-b90c-11e3-83de-83ceb9965c26/users/74d2d7da-e694-11e3-b0c6-4d2664c8e0c3/feed&quot;</span><span class="p">,</span>
+        <span class="s">&quot;groups&quot;</span> <span class="p">:</span> <span class="s">&quot;/groups/cd796d0a-b90c-11e3-83de-83ceb9965c26/users/74d2d7da-e694-11e3-b0c6-4d2664c8e0c3/groups&quot;</span><span class="p">,</span>
+        <span class="s">&quot;roles&quot;</span> <span class="p">:</span> <span class="s">&quot;/groups/cd796d0a-b90c-11e3-83de-83ceb9965c26/users/74d2d7da-e694-11e3-b0c6-4d2664c8e0c3/roles&quot;</span><span class="p">,</span>
+        <span class="s">&quot;following&quot;</span> <span class="p">:</span> <span class="s">&quot;/groups/cd796d0a-b90c-11e3-83de-83ceb9965c26/users/74d2d7da-e694-11e3-b0c6-4d2664c8e0c3/following&quot;</span><span class="p">,</span>
+        <span class="s">&quot;followers&quot;</span> <span class="p">:</span> <span class="s">&quot;/groups/cd796d0a-b90c-11e3-83de-83ceb9965c26/users/74d2d7da-e694-11e3-b0c6-4d2664c8e0c3/followers&quot;</span>
+      <span class="p">}</span>
+    <span class="p">}</span>
+  <span class="p">}</span> <span class="p">],</span>
+  <span class="s">&quot;timestamp&quot;</span> <span class="p">:</span> <span class="mi">1401751485776</span><span class="p">,</span>
+  <span class="s">&quot;duration&quot;</span> <span class="p">:</span> <span class="mi">220</span><span class="p">,</span>
+  <span class="s">&quot;organization&quot;</span> <span class="p">:</span> <span class="s">&quot;your-org&quot;</span><span class="p">,</span>
+  <span class="s">&quot;applicationName&quot;</span> <span class="p">:</span> <span class="s">&quot;your-app&quot;</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+</div>
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+      
+        <a href="activity.html" class="btn btn-neutral float-right" title="Activity" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+      
+      
+        <a href="working-user-data.html" class="btn btn-neutral" title="Working with User Data" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+      
+    </div>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/user-management/groups.html
----------------------------------------------------------------------
diff --git a/content/docs/user-management/groups.html b/content/docs/user-management/groups.html
new file mode 100644
index 0000000..6fd0a61
--- /dev/null
+++ b/content/docs/user-management/groups.html
@@ -0,0 +1,398 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>Groups &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1"><a class="reference internal" href="working-user-data.html">Working with User Data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>Groups</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/user-management/groups.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="groups">
+<h1>Groups<a class="headerlink" href="#groups" title="Permalink to this headline">¶</a></h1>
+<p>You can organize app users into groups. Groups have their own Activity
+Feed, their own permissions and be a useful alternative to Roles,
+depending on how you model your data. Groups were originaly designed to
+emulate Facebook Groups, so they will tend to function about the same
+way Facebook Groups would.</p>
+<p>Groups are hierarchical. Every member of the group
+/groups/california/san-francisco is also a member of the group
+/groups/california.</p>
+<p>Groups are also a great way to model things such a topic subscriptions.
+For example, you could allow people to subscribe (i.e. become a member
+of the group and be alerted via Activities) to /groups/memes/dogs/doge
+or subscribe to all /groups/memes/dogs</p>
+<div class="section" id="general-properties">
+<h2>General properties<a class="headerlink" href="#general-properties" title="Permalink to this headline">¶</a></h2>
+<table border="1" class="docutils">
+<colgroup>
+<col width="11%" />
+<col width="9%" />
+<col width="80%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Property</th>
+<th class="head">Type</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>uuid</td>
+<td>UUID</td>
+<td>Group’s unique entity ID</td>
+</tr>
+<tr class="row-odd"><td>type</td>
+<td>string</td>
+<td>Type of entity, in this case “user”</td>
+</tr>
+<tr class="row-even"><td>created</td>
+<td>long</td>
+<td><a class="reference external" href="http://en.wikipedia.org/wiki/Unix_time">UNIX timestamp</a> of entity creation</td>
+</tr>
+<tr class="row-odd"><td>modified</td>
+<td>long</td>
+<td><a class="reference external" href="http://en.wikipedia.org/wiki/Unix_time">UNIX timestamp</a> of entity modification</td>
+</tr>
+<tr class="row-even"><td>path</td>
+<td>string</td>
+<td>Valid slash-delimited group path (mandatory)</td>
+</tr>
+<tr class="row-odd"><td>title</td>
+<td>string</td>
+<td>Display name</td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="section" id="set-properties">
+<h2>Set properties<a class="headerlink" href="#set-properties" title="Permalink to this headline">¶</a></h2>
+<table border="1" class="docutils">
+<colgroup>
+<col width="23%" />
+<col width="15%" />
+<col width="62%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Set</th>
+<th class="head">Type</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>connections</td>
+<td>string</td>
+<td>Set of connection types (e.g., likes)</td>
+</tr>
+<tr class="row-odd"><td>rolenames</td>
+<td>string</td>
+<td>Set of roles assigned to a group</td>
+</tr>
+<tr class="row-even"><td>credentials</td>
+<td>string</td>
+<td>Set of group credentials</td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="section" id="collections">
+<h2>Collections<a class="headerlink" href="#collections" title="Permalink to this headline">¶</a></h2>
+<table border="1" class="docutils">
+<colgroup>
+<col width="17%" />
+<col width="15%" />
+<col width="68%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Collection</th>
+<th class="head">Type</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>users</td>
+<td>user</td>
+<td>Collection of users in the group</td>
+</tr>
+<tr class="row-odd"><td>activities</td>
+<td>activity</td>
+<td>Collection of activities a user has performed</td>
+</tr>
+<tr class="row-even"><td>feed</td>
+<td>activity</td>
+<td>Inbox of activity notifications a group has received</td>
+</tr>
+<tr class="row-odd"><td>roles</td>
+<td>role</td>
+<td>Set of roles to which a group belongs</td>
+</tr>
+</tbody>
+</table>
+</div>
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

[38/60] [abbrv] incubator-usergrid git commit: cherry picking docs from master

[sn...@apache.org]

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/counters-and-events/creating-and-incrementing-counters.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/counters-and-events/creating-and-incrementing-counters.txt b/content/docs/_sources/counters-and-events/creating-and-incrementing-counters.txt
new file mode 100644
index 0000000..3bf7f57
--- /dev/null
+++ b/content/docs/_sources/counters-and-events/creating-and-incrementing-counters.txt
@@ -0,0 +1,74 @@
+## Creating & incrementing counters
+To create a new counter or increment an existing counter, include the counter property in the body of a POST to the /events endpoint. More than one counter can be incremented in the same request.
+
+__Note__: It may take up to 30 seconds after an event has been posted for the counter to be incremented.
+
+### Request syntax
+
+    curl -X POST https://api.usergrid.com/<org>/<app>/events -d '{"timestamp":<timestamp>, "counters" : {<counter_name>:<increment_value>}}'
+    
+Parameters
+
+Parameter	    Description
+---------       -----------
+org	            Organization UUID or organization name
+app	            Application UUID or application name
+timestamp	    A required UNIX timestamp that specifies the time the counter is being incremented. 
+counter_name    The name of the counter to create or the existing counter to increment.
+increment_value	The value to increment the counter by. 
+
+Regarding the ``increment_value``, a negative number can be specified to decrement the value. A value of '0' can be specified to reset the value of the counter.
+
+For the ``timestamp``, specifying a value of 0 will automatically assign the current time.
+
+### Example request
+The following request will increment the 'button_clicks' counter by one, with a timestamp of the current time.
+
+    curl -X POST https://api.usergrid.com/your-org/your-app/events -d '{"timestamp":0, "counters" : {"button_clicks":1}}'
+    
+### Example response
+
+    {
+      "action" : "post",
+      "application" : "f34f4222-a166-11e2-a7f7-02e81adcf3d0",
+      "params" : { },
+      "path" : "/events",
+      "uri" : "https://api.usergrid.com/your-org/your-app/events",
+      "entities" : [ {
+        "uuid" : "b11217fc-9d3a-1427-b24e-699740088e05",
+        "type" : "event",
+        "created" : 1401224590293,
+        "modified" : 1401224590293,
+        "timestamp" : 1401224590293,
+        "counters" : {
+          "button_clicks" : 1
+        },
+        "message" : null,
+        "metadata" : {
+          "path" : "/events/b11217fc-9d3a-1427-b24e-699740088e05"
+        }
+      } ],
+      "timestamp" : 1401224590291,
+      "duration" : 30,
+      "organization" : "your-org",
+      "applicationName" : "your-app"
+    }
+		
+## Decrementing/resetting counters
+To decrement a counter, specify a negative number for the counter value in any of the above examples.
+
+To reset a counter, specify a value of 0 for the counter value in any of the above examples.
+
+Note that the Usergrid JavaScript SDK also provides dedicated methods for decrementing and resetting counters.
+
+## Using counters hierarchically
+
+You can organize counters into hierarchies by giving them dot-separated names, e.g. ``button_clicks.homepage``. Incrementing a counter lower in a hierarchy increments all of the counters upward in the hierarchy chain. 
+
+For example, you want to log errors that your app generates, so you create hierarchical counters for each module and function within that module. In this example, you create the following set of counters:
+
+    errors
+    errors.module
+    errors.module.function
+
+Incrementing ``errors.module.function`` by 1 increments all three counters by 1. A hierarchy can be a useful way of easily tracking actions in your app at both a cumulative and granular level.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/counters-and-events/events-and-counters.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/counters-and-events/events-and-counters.txt b/content/docs/_sources/counters-and-events/events-and-counters.txt
new file mode 100644
index 0000000..cbb0b93
--- /dev/null
+++ b/content/docs/_sources/counters-and-events/events-and-counters.txt
@@ -0,0 +1,8 @@
+# Counters & events
+Counters can be used to track statistics on many aspects of an application by keeping a running count of the number of times an action occurs in your app. Posting an event increments the counter. Counters can also be retrieved by time period, allowing you to generate reports on specific actions in your app.
+
+With Usergrid, you can define your own counters. Some of the things that you might track with a user-defined counter are:
+
+* How many times people click on the help button in your application.
+* How many times your game is played each day.
+* How many times your banner ads are clicked each day.

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/counters-and-events/retrieving-counters.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/counters-and-events/retrieving-counters.txt b/content/docs/_sources/counters-and-events/retrieving-counters.txt
new file mode 100644
index 0000000..5210952
--- /dev/null
+++ b/content/docs/_sources/counters-and-events/retrieving-counters.txt
@@ -0,0 +1,109 @@
+# Retrieving counters
+To retrieve a counter, do the following:
+
+## Request syntax
+
+    curl -X GET https://api.usergrid.com/counters?counter=<counter_name>
+    
+Parameters
+
+Parameter       Description
+---------       -----------
+counter_name	The name of the counter to be retrieved. 
+
+More than one counter can be retrieved with a single request by appending additional counter parameters to the request URI.
+
+## Example request
+
+    curl -X GET https://api.usergrid.com/my-org/my-app/counters?counter=button_clicks
+    
+## Example response
+
+    {
+      "action" : "get",
+      "application" : "f34f4222-a166-11e2-a7f7-02e81adcf3d0",
+      "params" : {
+        "counter" : [ "button_clicks" ]
+      },
+      "uri" : "https://api.usergrid.com/your-org/your-app",
+      "entities" : [ ],
+      "timestamp" : 1401310084096,
+      "duration" : 21,
+      "organization" : "your-org",
+      "applicationName" : "your-app",
+      "count" : 0,
+      "counters" : [ {
+        "name" : "button_clicks",
+        "values" : [ {
+          "timestamp" : 1,
+          "value" : 9
+        } ]
+      } ]
+    }
+		
+## Retrieving counters by time interval
+Knowing the value of a counter is useful; however, you often need to know how the value varies over time. Fortunately, the API provides a method for you to view this data over any time interval or level of granularity.
+
+For example, let’s say you’re incrementing a counter every time someone launches your application. You might be interested in which days of the week the application sees the most usage. Using the API, you can examine the counter over a set of weeks, with the data split into daily intervals. Using this information, you can see which are your peak days of usage. You can also view usage across a single day, so you can see if your application is used more in the mornings or the evenings.
+
+## Request syntax
+
+    curl -X GET https://api.usergrid.com/counters?start_time=<timestamp>&end_time=<timestamp>&resolution=<resolution>&counter=<counter_name>
+    
+Parameters
+
+Parameter	 Description
+---------    -----------
+start_time   The beginning of the time period to search
+end_time     The end of the time period to search
+resolution   The interval at which counters are displayed. 
+counter_name The name of the counter to be retrieved.
+
+The following resolutions are supported:
+
+* all
+* minute
+* five_minutes
+* half_hour
+* hour
+* six_day
+* day
+* week
+* month
+
+For example, if the interval is day, and the start time and end time values span 4 days, you will get aggregate counts for each of the 4 days.
+
+## Example request
+
+For example, to retrieve a time range of values, with a granularity of "day", for a counter called "button_clicks", the GET request would look like this:
+
+    curl -X GET https://api.usergrid.com/my-org/my-app/counters?start_time=1315119600000&end_time=1315724400000&resolution=day&counter=button_clicks
+    
+## Example response
+
+    {
+     action: "get",
+        uri: "http://api.usergrid.com/438a1ca1-cf9b-11e0-bcc1-12313f0204bb/counters",
+        timestamp: 1315354369272,
+        duration: 28,
+        counters: [
+            {
+                name: "button_clicks",
+                values: [
+                    {
+                        value: 2
+                        timestamp: 1315180800000
+                    },
+                    {
+                        value: 1
+                        timestamp: 1315267200000
+                    },
+                    {
+                        value: 1
+                        timestamp: 1315353600000
+                    }
+                ]
+            }
+        ]
+    }
+		
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/data-queries/advanced-query-usage.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/data-queries/advanced-query-usage.txt b/content/docs/_sources/data-queries/advanced-query-usage.txt
new file mode 100644
index 0000000..4b78215
--- /dev/null
+++ b/content/docs/_sources/data-queries/advanced-query-usage.txt
@@ -0,0 +1,23 @@
+# Advanced query usage
+
+<div class="admonition note"> <p class="first admonition-title">Note</p> <p class="last">

+Query examples in this content are shown unencoded to make them easier to read. Keep in mind that you might need to encode query strings if you're sending them as part of URLs, such as when you're executing them with the cURL tool.
+</p></div>
+
+## Attaching a query to all API calls
+
+
+<div class="admonition note"> <p class="first admonition-title">Note</p> <p class="last">

+<p>JavaScript SDK only.</p>
+In some cases, it may be convenient to attach a query or other URI parameter to every call you make to Usergrid, such as a custom identifier or token. To do this with the Usergrid JavaScript SDK, add a qs property to your Usergrid.Client object when you initialize the SDK. For more on initializing the SDK, see our install guide.
+</p></div>
+
+For example, the following would append ?custom_id=1234 to every call sent from the Usergrid JavaScript SDK to Usergrid:
+
+    var options = {
+        orgName:'yourOrg',
+        appName:'yourApp',
+        qs:'custom_id=1234'
+    }
+    var dataClient = new Usergrid.Client(options);
+

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/data-queries/operators-and-types.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/data-queries/operators-and-types.txt b/content/docs/_sources/data-queries/operators-and-types.txt
new file mode 100644
index 0000000..c67ccd1
--- /dev/null
+++ b/content/docs/_sources/data-queries/operators-and-types.txt
@@ -0,0 +1,120 @@
+# Query operators & data types
+
+The following operators and data types are supported by the SQL-like query language in Usergrid.
+
+## Operators
+
+<table class="usergrid-table">
+    <tr>
+        <td>Operator</td>
+        <td>Purpose</td>
+        <td>Example</td>
+    </tr>
+    <tr>
+        <td>'<' or 'lt'</td>
+        <td>Less than</td>
+        <td>select * where quantity > '1000'</td>
+    </tr>
+    <tr>
+        <td>'<=' or 'lte'</td>
+        <td>Less than or equal to</td>
+        <td>Example</td>
+    </tr>
+    <tr>
+        <td>'=' or 'eq'</td>
+        <td>Equals</td>
+        <td>select * where price = '20.00'</td>
+    </tr>
+    <tr>
+        <td>'>=' or 'gte'</td>
+        <td>Greater than or equal to </td>
+        <td>select * where quantity >= '1000'</td>
+    </tr>
+    <tr>
+        <td>'>' or 'gt'</td>
+        <td>Greater than</td>
+        <td>select * where quantity > '1000'</td>
+    </tr>
+    <tr>
+        <td>not <some_expression></td>
+        <td>Subtraction of results</td>
+        <td>select * where quantity < '4000' and not quantity = '2000'</td>
+    </tr>
+    <tr>
+        <td>and</td>
+        <td>Union of results</td>
+        <td>select * where quantity > '1000' and quantity < '4000'</td>
+    </tr>
+    <tr>
+        <td>or</td>
+        <td>Intersection of results</td>
+        <td>select * where quantity = '1000' or quantity = '4000'</td>
+    </tr>
+    <tr>
+        <td>contains</td>
+        <td>Narrow by contained text</td>
+        <td>select * where title contains 'tale'</td>
+    </tr>
+</table>
+
+
+## Data types
+
+As you develop queries, remember that entity properties each conform to a particular data type. For example, in the default entity User, the name property is stored as a string, the created date as a long, and metadata is stored as a JSON object. Your queries must be data type-aware to ensure that query results are as you expect them to be.
+
+For example, if you create an entity with a price property with a value of 100.00, querying for 100 will return no results, since the API expected a decimal-delimited float value in your query.
+
+For a list of property data types for each default entities, see Default Data Entity Types.
+
+<table class="usergrid-table">
+    <tr>
+        <td>string</td>
+        <td><pre>'value', unicode '\uFFFF', octal '\0707'</pre></td>
+    </tr>
+    <tr>
+        <td>long</td>
+        <td><pre>1357412326021</pre> <br> Timestamps are typically stored as long values.</td>
+    </tr>
+    <tr>
+        <td>float</td>
+        <td><pre>10.1, -10.1, 10e10, 10e-10, 10E10, 10E-10</pre> <br>
+        Your query must be specific about the value you're looking for, down to the value 
+        (if any) after the decimal point.</td>
+    </tr>
+    <tr>
+        <td>boolean</td>
+        <td><pre>true | false</pre></td>
+    </tr>
+    <tr>
+        <td>UUID</td>
+        <td><pre>ee912c4b-5769-11e2-924d-02e81ac5a17b</pre></td>
+    </tr>
+    <tr>
+        <td>Array</td>
+        <td><pre>["boat", "car", "bike"]</pre></td>
+    </tr>
+    <tr>
+        <td>object</td>
+        <td><p>For a JSON object like this one:</p>
+            <pre>
+                {
+                 "items": [
+                  {
+                   "name": "rocks"
+                  },
+                  {
+                   "name": "boats"
+                  }
+                 ]
+                }
+            </pre>
+            <p>you can use dot notation to reach property values in the object:</p>
+            <pre>
+                 /mycollection/thing?ql="select * where items.name = 'rocks'"
+            </pre>
+            <p>Objects are often used to contain entity metadata, such as the activities 
+            associated with a user, the users associated with a role, and so on.</p>
+            <p>Please note that object properties are not indexed. This means queries 
+            using dot-notation will be much slower than queries on indexed entity properties.</p></td>
+    </tr>
+</table>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/data-queries/query-language.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/data-queries/query-language.txt b/content/docs/_sources/data-queries/query-language.txt
new file mode 100644
index 0000000..a491740
--- /dev/null
+++ b/content/docs/_sources/data-queries/query-language.txt
@@ -0,0 +1,427 @@
+# Query Language
+
+> Query examples in this content are shown unencoded to make
+> them easier to read. Keep in mind that you might need to encode query
+> strings if you're sending them as part of URLs, such as when you're
+> executing them with the cURL tool.
+
+The following example retrieves a list of restaurants (from a
+restaurants collection) whose name property contains the value "diner",
+sorting the list in ascending order by name:
+
+    /restaurants?ql=select * where name contains 'diner' order by name asc
+
+
+## Basic syntax
+
+Queries of Usergrid data for Apache Usergrid are made up of two kinds of
+statements: the path to the collection you want to query, followed by
+the query language statement containing your query. These two statements
+are separated by "?ql=" to indicate where the query language statement
+starts.
+
+To retrieve items from a collection, you would use a syntax such as the
+following:
+
+    /<collection>?ql=<query_statement>
+
+In the following example, the query is retrieving all users whose name
+is Gladys Kravitz.
+
+    /users?ql=select * where name = 'Gladys Kravitz'
+
+The following example selects all items except those that have an a
+property value of 5:
+
+    /items?ql=select * where NOT a = 5
+
+Note that there is a shortcut available when your query selects all
+items matching certain criteria -- in other words, where you use a
+statement that starts "select \* where". In this case, you can omit the
+first part of the statement and abbreviate it this way:
+
+    /items?ql=NOT a = 5
+
+You query your Apache Usergrid data by using a query syntax that's like
+Structured Query Language (SQL), the query language for relational
+databases. Unlike a relational database, where you specify tables and
+columns containing the data you want to query, in your Apache Usergrid
+queries you specify collections and entities.
+
+The syntax of Apache Usergrid queries only *resembles* SQL to
+make queries familiar and easier to write. However, the language isn't
+SQL. Only the syntax items documented here are supported.
+
+## Supported operators
+
+Comparisons
+
+* Less than `<` or `lt`
+* Less than or equal `<=` or `lte`
+* Equal `=` or `eq`
+* Greater than or equal `>=` or `gte`
+* Greater than `>` or `gt`
+* Not equal `NOT`
+
+Logical operations
+
+* Intersection of results `and`
+* Union of results `or`
+* Subtraction of results `not`
+
+
+## Query Response Format
+
+the query’s response is formatted in
+JavaScript Object Notation (JSON). This is a common format used for
+parameter and return values in REST web services.
+
+So for the following query:
+
+    /users?ql=select * where name = ‘Gladys Kravitz’
+
+...you would get a response such as the the one below. The JSON format
+arranges the data in name/value pairs. Many of the values correspond to
+specifics of the request, including the request’s HTTP action (GET), the
+application’s UUID, the request’s parameters (the query string you
+sent), and so on.
+
+Here, the query is asking for whole entities in the users collection.
+Data corresponding to the response is captured in the response’s
+`entities` array. The array has one member here, corresponding to the
+one user found by the query (another kind of query might have found more
+users). That one member gives the UUID of the entity (user), the entity
+type, and values for properties such as name, username, email, and so
+on.
+
+```json
+{
+  "action" : "get",
+  "application" : "8272c9b0-d86a-11e2-92e2-cdf1ce04c1c0",
+  "params" : {
+    "ql" : [ "select * where name = 'Gladys Kravitz'" ]
+  },
+  "path" : "/users",
+  "uri" : "http://api.usergrid.com/myorg/myapp/users",
+  "entities" : [ {
+    "uuid" : "d0d7d0ba-e97b-11e2-8cef-411c466c4f2c",
+    "type" : "user",
+    "name" : "Gladys Kravitz",
+    "created" : 1373472876859,
+    "modified" : 1373472876859,
+    "username" : "gladys",
+    "email" : "gladys@example.com",
+    "activated" : true,
+    "picture" : "http://www.gravatar.com/avatar/20c57d4f41cf51f2db44165eb058b3b2",
+    "metadata" : {
+      "path" : "/users/d0d7d0ba-e97b-11e2-8cef-411c466c4f2c",
+      "sets" : {
+        "rolenames" : "/users/d0d7d0ba-e97b-11e2-8cef-411c466c4f2c/rolenames",
+        "permissions" : "/users/d0d7d0ba-e97b-11e2-8cef-411c466c4f2c/permissions"
+      },
+      "connections" : {
+        "firstname" : "/users/d0d7d0ba-e97b-11e2-8cef-411c466c4f2c/firstname",
+        "lastname" : "/users/d0d7d0ba-e97b-11e2-8cef-411c466c4f2c/lastname"
+      },
+      "collections" : {
+        "activities" : "/users/d0d7d0ba-e97b-11e2-8cef-411c466c4f2c/activities",
+        "devices" : "/users/d0d7d0ba-e97b-11e2-8cef-411c466c4f2c/devices",
+        "feed" : "/users/d0d7d0ba-e97b-11e2-8cef-411c466c4f2c/feed",
+        "groups" : "/users/d0d7d0ba-e97b-11e2-8cef-411c466c4f2c/groups",
+        "roles" : "/users/d0d7d0ba-e97b-11e2-8cef-411c466c4f2c/roles",
+        "following" : "/users/d0d7d0ba-e97b-11e2-8cef-411c466c4f2c/following",
+        "followers" : "/users/d0d7d0ba-e97b-11e2-8cef-411c466c4f2c/followers"
+      }
+    }
+  } ],
+  "timestamp" : 1374694196061,
+  "duration" : 48,
+  "organization" : "myorg",
+  "applicationName" : "myapp",
+  "count" : 1
+}
+```
+
+Compare the preceding example with the following for another kind of
+query. Imagine the following request string, where the query string is
+asking for only the values of two of the entity’s properties (username
+and name):
+
+    /users?ql=select username,name where name=’Gladys Kravitz’
+
+In the response JSON from this query, the return value is specified as
+the property of the `list` item -- here, an array containing only the
+values of the properties the query asked for, in the order they were
+requested (username first, then name).
+
+    {
+      "action" : "get",
+      "application" : "8272c9b0-d86a-11e2-92e2-cdf1ce04c1c0",
+      "params" : {
+        "ql" : [ "select username,name where name='Gladys Kravitz'" ]
+      },
+      "path" : "/users",
+      "uri" : "http://api.usergrid.com/myorg/myapp/users",
+      "list" : [ [ "gladys", "Gladys Kravitz" ] ],
+      "timestamp" : 1374697463190,
+      "duration" : 25,
+      "organization" : "myorg",
+      "applicationName" : "myapp",
+      "count" : 1
+    }
+
+
+## Data types supported in queries
+
+As you develop queries for your Apache Usergrid data, remember that entity
+properties each conform to a particular data type (whether the entity is
+included by default or an entity you defined). Your queries must
+acknowledge this, testing with values that conform to each property's
+data type. (You can view the list of property data types for the default
+entities at [Default Data Entities](/default-data-entities).)
+
+For example, in the default entity `User`, the `name` property is stored
+as a `string`, the created date as a `long`, and metadata is stored as a
+JSON object. Your queries must be data type-aware so that you can be
+sure that query results are as you expect them to be.
+
+So imagine you define an entity with a `price` property whose value
+might be `100.00`. Querying for `100` will return no results even if
+there are occurrences of `100.00` as `price` values in your data set.
+That's because the database expected a decimal-delimited `float` value
+in your query.
+
+
+Data Type     Examples                                                                                    Notes
+----------- ------------------------------------------------------------------------------------------- ---------
+`string`    `'value'`, `unicode '\uFFFF'`, `octal '\0707'`                                              true | false
+`long`      1357412326021                                                                               Timestamps are typically stored as `long` values.
+`float`     10.1, -10.1, 10e10, 10e-10, 10E10, 10e-10                                                   Your query must be specific about the value you're looking for, down to the value (if any) after the decimal point.
+`boolean`   true | false                                      
+`UUID`      ee912c4b-5769-11e2-924d-02e81ac5a17b                                                        UUID types are typically used for the unique IDs of entities. The value must conform to the following format (do not enclose with quotation marks): xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+
+
+`object`    For a JSON object like this one:
+
+```
+  {
+    "items":[
+      {"name":"rocks"},
+      {"name":"boats"}
+    ]
+  }
+```
+
+you can use dot notation to reach property values in the object: /mycollection/thing?ql="select * where items.name = 'rocks'"                        Objects are often used to contain entity metadata, such as the activities associated with a user, the users associated with a role, and so on.
+
+## Retrieving values for multiple properties
+
+Your query can return multiple kinds of values -- such as the values of
+multiple properties -- by specifying the property names in your select
+statement as a comma-separated list.
+
+For example, the following request returns the address and phone number
+of users whose name is Gladys Kravitz:
+
+    /users?ql=select address,phone_number where name = 'Gladys Kravitz'
+
+
+## Querying for the contents of text
+
+Your query can search the text of entity values of the string data type.
+For example, you can search a postal code field for values that start
+with a specific three numbers.
+
+For example, the following query selects all restaurants with the word
+`diner` in the name:
+
+    /restaurants?ql=select * where name contains 'diner'
+
+**Note:** Not all string properties of the default entities are
+indexed for searching. This includes the `User` entity's `username`
+property.
+
+This will return all users whose name property contains the word 'Kravitz'
+
+    /users?ql=select * where name contains 'Kravitz'
+
+This will return all users whose name property contains a word beginning with 'Krav'
+
+    /users?ql=select * where name contains 'Krav*'
+
+This will return all users whose name is exactly 'Gladys Kravitz'
+
+    /users?ql=select * where name = 'Gladys Kravitz'
+
+
+## Sorting results
+
+You can return query results that are sorted in the order you specify.
+Use the `order by` clause to specify the property to sort by, along with
+the order in which results should be sorted. The syntax for the clause
+is as follows `order by <property_name> asc | desc`
+
+The following table includes a few examples:
+
+    /users?ql=select * where lastname = 'Smith' order by firstname asc
+
+
+    /users?ql=select * where lastname = 'Smith' order by firstname desc
+
+
+    /users?ql=select * where lastname contains 'Sm*' order by lastname asc, firstname asc
+
+
+## Geoqueries
+
+Many of today's apps are enhanced by the use of *geolocation*, wireless
+detection of the physical location of a remote device. These apps are
+said to be *geolocation-aware* in that they query the device to
+determine the user's position and then use this data to further enhance
+the user's experience. For example, apps can capture the exact location
+where a picture was taken or a message was created.
+
+Usergrid support geolocation on any entity, both built in (e.g.,
+users, groups) and user defined.
+
+To add a location to any entity, include the following member to the
+JSON in a POST or PUT call:
+
+    "location": {
+        "latitude": 37.779632,
+        "longitude": -122.395131  
+    } 
+
+For example, to store a listing of restaurants and their locations,
+start by creating a collection called restaurants:
+
+    POST https://api.usergrid.com/org_name/app_name/restaurants
+
+Next, add a new entity to the collection:
+
+    POST https://api.usergrid.com/org_name/app_name/restaurants
+    {
+      "name": "Rockadero",
+      "address": "21 Slate Street, Bedrock, CA",
+      "location": {
+        "latitude": 37.779632,
+        "longitude": -122.395131
+      }
+    }
+
+This creates a new restaurant entity called "Rockadero" with the
+longitude and latitude included as part of the object.
+
+When a location is added to an entity, it is easy to make queries
+against that data. For example, to see all restaurants within a 10 mile
+radius of the user's location, make a GET call against that entity, and
+include a search query in the following format:
+
+    location within <distance in meters> of <latitude>, <longitude>
+
+If we use the location of our user Fred, we first need to convert miles
+to meters. 1 mile is equivalent to 1609.344 meters, so 10 miles is about
+16093 meters. Thus, the API call looks like this:
+
+    GET https://api.usergrid.com/org_name/app_name/restaurants?ql=location within 16093 of 37.776753, -122.407846
+
+
+## Managing large sets of results
+
+When your query might return more results than you want to display to
+the user at once, you can use the limit parameter with cursors or API
+methods to manage the display of results. By default, query results are
+limited to 10 at a time. You can adjust this by setting the limit
+parameter to a value you prefer.
+
+For example, you might execute a query that could potentially return
+hundreds of results, but you want to display 20 of those at a time to
+users. To do this, your code sets the limit parameter to 20 when
+querying for data, then provides a way for the user to request more of
+the results when they're ready.
+
+You would use the following parameters in your query:
+
++-------------------------+-------------------------+-------------------------+
+| Parameter               | Type                    | Description             |
++=========================+=========================+=========================+
+| `limit`                 | integer                 | Number of results to    |
+|                         |                         | return. The maximum     |
+|                         |                         | number of results is    |
+|                         |                         | 1,000. Specifying a     |
+|                         |                         | limit greater than      |
+|                         |                         | 1,000 will result in a  |
+|                         |                         | limit of 1,000.         |
+|                         |                         |                         |
+|                         |                         | Limit is applied to the |
+|                         |                         | collection, not the     |
+|                         |                         | query string. For       |
+|                         |                         | example, the following  |
+|                         |                         | query will find the     |
+|                         |                         | first 100 entities in   |
+|                         |                         | the books collection,   |
+|                         |                         | then from that set      |
+|                         |                         | return the ones with    |
+|                         |                         | author='Hemingway':     |
+|                         |                         |                         |
+|                         |                         |     /books?ql=author =  |
+|                         |                         | 'Hemingway'&limit=100   |
+|                         |                         |                         |
+|                         |                         | You can also use the    |
+|                         |                         | limit parameter on a    |
+|                         |                         | request without a query |
+|                         |                         | string. The following   |
+|                         |                         | example is shorthand    |
+|                         |                         | for selecting all books |
+|                         |                         | and limiting by 100 at  |
+|                         |                         | a time:                 |
+|                         |                         |                         |
+|                         |                         |     /books?limit=100    |
+|                         |                         |                         |
+|                         |                         | Using a limit on a      |
+|                         |                         | DELETE can help you     |
+|                         |                         | manage the amount of    |
+|                         |                         | time it takes to delete |
+|                         |                         | data. For example you   |
+|                         |                         | can delete all of the   |
+|                         |                         | books, 1000 at a time,  |
+|                         |                         | with the following:     |
+|                         |                         |                         |
+|                         |                         |     DELETE /books?limit |
+|                         |                         | =1000                   |
+|                         |                         |                         |
+|                         |                         | Keep in mind that       |
+|                         |                         | DELETE operations can   |
+|                         |                         | take longer to execute. |
+|                         |                         | Yet even though the     |
+|                         |                         | DELETE query call might |
+|                         |                         | time out (such as with  |
+|                         |                         | a very large limit),    |
+|                         |                         | the operation will      |
+|                         |                         | continue on the server  |
+|                         |                         | even if the client      |
+|                         |                         | stops waiting for the   |
+|                         |                         | result.                 |
++-------------------------+-------------------------+-------------------------+
+| `cursor`                | string                  | An encoded              |
+|                         |                         | representation of the   |
+|                         |                         | query position pointing |
+|                         |                         | to a set of results. To |
+|                         |                         | retrieve the next set   |
+|                         |                         | of results, pass the    |
+|                         |                         | cursor with your next   |
+|                         |                         | call for most results.  |
++-------------------------+-------------------------+-------------------------+
+
+For example:
+
+Select all users whose name starts with fred, and returns the first 50
+results:
+
+    /users?ql=select * where name = 'fred*'&limit=50
+
+Retrieve the next batch of users whose name is "fred", passing the
+cursor received from the last request to specify where the next set of
+results should begin:
+
+    /users?ql=select * where name = 'fred*'&limit=50&cursor=LTIxNDg0NDUxNDpnR2tBQVFFQWdITUFDWFJ2YlM1emJXbDBhQUNBZFFBUUQyMVZneExfRWVLRlV3TG9Hc1doZXdDQWRRQVFIYVdjb0JwREVlS1VCd0xvR3NWT0JRQQ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/data-queries/query-parameters.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/data-queries/query-parameters.txt b/content/docs/_sources/data-queries/query-parameters.txt
new file mode 100644
index 0000000..9f9fc68
--- /dev/null
+++ b/content/docs/_sources/data-queries/query-parameters.txt
@@ -0,0 +1,153 @@
+# Query parameters & clauses
+
+When querying your data, you can use your query string to get the data, then sort and manage it on the client. This topic describes a few techniques.
+
+Query examples in this content are shown unencoded to make them easier to read. Keep in mind that you might need to encode query strings if you're sending them as part of URLs, such as when you're executing them with the cURL tool.
+
+<div class="admonition note"> <p class="first admonition-title">Note</p> <p class="last">

+Optimizing queries. As a best practice, you should include no more than 3 parameters in your queries. The API will not prevent you from submitting a query with more than 3 parameters; however, due to the nature of NoSQL, queries with many parameters can quickly become very inefficient.
+</p></div>
+
+For more information, see our [Usergrid DBMS overview](../data-store/data-storage-dbms.html) and [Data store best practices](../data-storage/optimizing-access).
+
+### Contains
+
+Your query can search the text of entity values of the string data type. For example, you can search a postal code field for values that start with a specific three numbers.
+
+For example, the following query selects all restaurants with the word diner in the name:
+
+    /restaurants?ql=select * where restaurants contains 'diner'
+    
+__Note__: Not all string properties of the default entities are indexed for searching. This includes the User entity's username property.
+
+The following table lists a few examples of the kind of searches you can do in queries.
+
+<table class="usergrid-table">
+    <tr>
+        <td>Goal</td>
+        <td>Example</td>
+        <td>Notes</td>
+    </tr>
+    <tr>
+        <td>Find books whose 'title' property contains the full word "tale".</td>
+        <td><pre>/books?ql=select * where title contains 'tale'</pre></td>
+        <td>containslooks for the occurrence of a full word anywhere in the searched property. Note that contains will not work on the 'name' property, since it is not full-text indexed in the database.</td>
+    </tr>
+    <tr>
+        <td>Find books whose 'title' property contains a word that starts with "ta".</td>
+        <td><pre>/books?ql=select * where title contains 'ta*'</pre></td>
+        <td>containswill look for partial words if you include a wildcard.</td>
+    </tr>
+    <tr>
+        <td>Find books whose title property is exactly and only "A Tale of Two Cities".</td>
+        <td><pre>/books?ql=select * where title = 'A Tale of Two Cities'</pre></td>
+        <td>The = operator is looking for a match in the entire searched property value. Use a * wildcard to look for some set of the first characters only.</td>
+    </tr>
+</table>
+    
+
+### Location
+
+If you've stored location data with your entities, you can query for the proximity of the geographical locations those entities represent. For more information on geolocation, see Geolocation.
+
+<table class="usergrid-table">
+    <tr>
+        <td>Goal</td>
+        <td>Example</td>
+        <td>Notes</td>
+    </tr>
+    <tr>
+        <td>Find stores whose locations are within the specified longitude and latitude.</td>
+        <td><pre>/stores?ql=location within 500 of 40.042016, -86.900749</pre></td>
+        <td>within will test for values within the value you specify. The within value is expressed as a number of meters.<br>The return results are sorted in order of nearest to furthest. If there are multiple entries at the same location, they're returned in the order they were added to the database.<br> For more on geolocation queries, see Geolocation.</td>
+    </tr>
+</table>
+
+### Order by
+
+You can return query results that are sorted in the order you specify. Use the order by clause to specify the property to sort by, along with the order in which results should be sorted. The syntax for the clause is as follows:
+
+    order by <property_name> asc | desc
+    
+The following table includes a few examples:
+
+<table class="usergrid-table">
+    <tr>
+        <td>Goal</td>
+        <td>Example</td>
+    </tr>
+    <tr>
+        <td>Sort by first name in ascending order</td>
+        <td>/users?ql=select * where lastname = 'Smith' order by firstname asc</td>
+    </tr>
+    <tr>
+        <td>Sort by first name in descending order</td>
+        <td>/users?ql=select * where lastname = 'Smith' order by firstname desc</td>
+    </tr>
+    <tr>
+        <td>Sort by last name, then first name in ascending orderl</td>
+        <td>/users?ql=select * where lastname contains 'Sm*' order by lastname asc, firstname asc</td>
+    </tr>
+<table>
+    
+
+### Limit
+
+When your query might return more results than you want to display to the user at once, you can use the limit parameter with cursors or API methods to manage the display of results. By default, query results are limited to 10 at a time. You can adjust this by setting the limit parameter to a value you prefer.
+
+For example, you might execute a query that could potentially return hundreds of results, but you want to display 20 of those at a time to users. To do this, your code sets the limit parameter to 20 when querying for data, then provides a way for the user to request more of the results when they're ready.
+
+You would use the following parameters in your query:
+
+<table class="usergrid-table">
+    <tr>
+        <td>Parameter</td>
+        <td>Type</td>
+        <td>Description</td>
+    </tr>
+    <tr>
+        <td>limit</td>
+        <td>integer</td>
+        <td><p>Number of results to return. The maximum number of results is 1,000. 
+            Specifying a limit greater than 1,000 will result in a limit of 1,000.</p>
+            <p>You can also use the limit parameter on a request without a query string. 
+            The following example is shorthand for selecting all books and limiting by 100 at a time:</p>
+            <pre>/books?limit=100</pre>
+            <p>Using a limit on a DELETE can help you manage the amount of time it takes 
+            to delete data. For example you can delete all of the books, 1000 at a time, 
+            with the following:</p>
+            <pre>DELETE /books?limit=1000</pre>
+            <p> Keep in mind that DELETE operations can take longer to execute. 
+            Yet even though the DELETE query call might time out (such as with a 
+            very large limit), the operation will continue on the server even if 
+            the client stops waiting for the result.</p>
+        </td>
+    </tr>
+</table>
+
+For example:
+
+Select all users whose name starts with fred, and returns the first 50 results:
+
+    /users?ql=select * where name = 'fred*'&limit=50
+  
+   
+### Cursor
+
+<table class="usergrid-table">
+    <tr>
+        <td>Parameter</td>
+        <td>Type</td>
+        <td>Description</td>
+    </tr>
+    <tr>
+        <td>cursor</td>
+        <td>string</td>
+        <td>An encoded representation of the query position pointing to a set of results. To retrieve the next set of results, pass the cursor with your next call for most results./td>
+    </tr>
+</table>
+        
+Retrieve the next batch of users whose name is "fred", passing the cursor received from the last request to specify where the next set of results should begin:
+
+    /users?ql=select * where name = 'fred*'&limit=50&cursor=LTIxNDg0NDUxNDpVdjb0JwREVlS1VCd0xvR3NWT0JRQQ
+    
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/data-queries/querying-your-data.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/data-queries/querying-your-data.txt b/content/docs/_sources/data-queries/querying-your-data.txt
new file mode 100644
index 0000000..fa10169
--- /dev/null
+++ b/content/docs/_sources/data-queries/querying-your-data.txt
@@ -0,0 +1,121 @@
+# Querying your data
+
+This article describes how to use queries to filter data retrieved from your backend data store. Queries allow you to work with only the data you need, making your app more efficient and manageable by reducing the number of entities returned or acted on by the API. A query can be sent with any GET, PUT or DELETE request. For example, you might query the API to retrieve only the user entities with the property status:'active' to get a list of your users that have active accounts.
+
+For information on more advanced query usage and syntax, see [Query parameters & clauses](query-parameters.html).
+
+<div class="admonition note"> <p class="first admonition-title">Note</p> <p class="last">

+Query examples in this content are shown unencoded to make them easier to read. Keep in mind that you might need to encode query strings if you're sending them as part of URLs, such as when you're executing them with the cURL tool.
+</p></div>
+
+## Basic query usage
+
+The following examples show how to query the Usergrid API to return the first 5 entities in the users collection that contain the property status:'active'.
+
+<div class="admonition note"> <p class="first admonition-title">Note</p> <p class="last">

+Optimizing queries: As a best practice, you should include no more than 3 parameters in your queries. The API will not prevent you from submitting a query with more than 3 parameters; however, due to the nature of NoSQL, queries with many parameters can quickly become very inefficient.
+</p></div>
+
+For more information, see our [Usergrid DBMS overview](../data-store/data-storage-dbms.html) and [Data store best practices](../data-storage/optimizing-access).
+
+### Request Syntax
+
+	https://api.usergrid.com/<org>/<app>/<collection>?ql=<query_statement>
+
+Note: Any values specified in the query statement should be enclosed in single-quotes.
+
+	https://api.usergrid.com/your-org/your-app/users?limit=5&ql=select * where status = 'active'
+	
+Alternatively, when you use a statement that starts select * where you can omit the first part of the statement and abbreviate it this way:
+
+	https://api.usergrid.com/your-org/your-app/users?limit=5&ql=status = 'active'
+	
+### Retrieving values for multiple properties
+
+Your query can return multiple kinds of values -- such as the values of multiple properties -- by specifying the property names in your select statement as a comma-separated list.
+
+For example, the following request returns the address and phone number of users whose name is Gladys Kravitz:
+
+	/users?ql=select address,phone_number where name = 'Gladys Kravitz'
+	
+### Response syntax
+
+When you query your data, the API response is formatted in JavaScript Object Notation (JSON). This is a common format used for parameter and return values in REST web services.
+
+Data corresponding to the response is captured in the response’s entities array. The array will include one JSON-object for each entity returned for the query. Each returned entity will include a number of default properties, including the UUID of the entity, the entity type, and values for properties such as name, username, email, and so on. For a complete list of default properties by entity type, see Default Data Entity Types.
+
+For example, the following query for all entities of type user where the name property equals 'Gladys Kravitz':
+
+	/users?ql=select * where name = ‘Gladys Kravitz’
+
+will return the following response:
+
+	{
+	  "action" : "get",
+	  "application" : "8272c9b0-d86a-11e2-92e2-cdf1ce04c1c0",
+	  "params" : {
+	    "ql" : [ "select * where name = 'Gladys Kravitz'" ]
+	  },
+	  "path" : "/users",
+	  "uri" : "http://api.usergrid.com/myorg/myapp/users",
+	  "entities" : [ {
+	    "uuid" : "d0d7d0ba-e97b-11e2-8cef-411c466c4f2c",
+	    "type" : "user",
+	    "name" : "Gladys Kravitz",
+	    "created" : 1373472876859,
+	    "modified" : 1373472876859,
+	    "username" : "gladys",
+	    "email" : "gladys@example.com",
+	    "activated" : true,
+	    "picture" : "http://www.gravatar.com/avatar/20c57d4f41cf51f2db44165eb058b3b2",
+	    "metadata" : {
+	      "path" : "/users/d0d7d0ba-e97b-11e2-8cef-411c466c4f2c",
+	      "sets" : {
+	        "rolenames" : "/users/d0d7d0ba-e97b-11e2-8cef-411c466c4f2c/rolenames",
+	        "permissions" : "/users/d0d7d0ba-e97b-11e2-8cef-411c466c4f2c/permissions"
+	      },
+	      "connections" : {
+	        "firstname" : "/users/d0d7d0ba-e97b-11e2-8cef-411c466c4f2c/firstname",
+	        "lastname" : "/users/d0d7d0ba-e97b-11e2-8cef-411c466c4f2c/lastname"
+	      },
+	      "collections" : {
+	        "activities" : "/users/d0d7d0ba-e97b-11e2-8cef-411c466c4f2c/activities",
+	        "users" : "/users/d0d7d0ba-e97b-11e2-8cef-411c466c4f2c/users",
+	        "feed" : "/users/d0d7d0ba-e97b-11e2-8cef-411c466c4f2c/feed",
+	        "groups" : "/users/d0d7d0ba-e97b-11e2-8cef-411c466c4f2c/groups",
+	        "roles" : "/users/d0d7d0ba-e97b-11e2-8cef-411c466c4f2c/roles",
+	        "following" : "/users/d0d7d0ba-e97b-11e2-8cef-411c466c4f2c/following",
+	        "followers" : "/users/d0d7d0ba-e97b-11e2-8cef-411c466c4f2c/followers"
+	      }
+	    }
+	  } ],
+	  "timestamp" : 1374694196061,
+	  "duration" : 48,
+	  "organization" : "myorg",
+	  "applicationName" : "myapp",
+	  "count" : 1
+	}
+	
+Compare the preceding example with the following for another kind of query. Imagine the following request string, where the query string is asking for only the values of two of the entity’s properties (username and name):
+
+	/users?ql=select username,name where name=’Gladys Kravitz’
+	
+In the response JSON from this query, the return value is specified as the property of the list item -- here, an array containing only the values of the properties the query asked for, in the order they were requested (username first, then name).
+
+	{
+	  "action" : "get",
+	  "application" : "8272c9b0-d86a-11e2-92e2-cdf1ce04c1c0",
+	  "params" : {
+	    "ql" : [ "select username,name where name='Gladys Kravitz'" ]
+	  },
+	  "path" : "/users",
+	  "uri" : "http://api.usergrid.com/myorg/myapp/users",
+	  "list" : [ [ "gladys", "Gladys Kravitz" ] ],
+	  "timestamp" : 1374697463190,
+	  "duration" : 25,
+	  "organization" : "myorg",
+	  "applicationName" : "myapp",
+	  "count" : 1
+	}
+	
+	
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/data-storage/collections.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/data-storage/collections.txt b/content/docs/_sources/data-storage/collections.txt
new file mode 100644
index 0000000..c072104
--- /dev/null
+++ b/content/docs/_sources/data-storage/collections.txt
@@ -0,0 +1,254 @@
+# Collections
+
+## Creating Collections
+
+This article describes how to create collections in Advanced Usergrid. All entities are automatically associated with a corresponding collection based on the type property of the entity. You may create empty collections if you wish, but creating an entity of a new type will automatically create a corresponding collection for you. For example, creating a new custom "item" entity, creates an "items" collection.
+
+__Note__: Although not shown in the API examples below, you need to provide a valid access token with each API call. See Authenticating users and application clients for details.
+
+### Creating a collection
+
+The following example shows how to create an empty collection. Alternatively, you can create a collection simply by creating a new entity with a 'type' property that corresponds to the collection you wish to create. For more on creating entities, see Creating Custom Data Entities
+
+### Request Syntax
+
+    curl -X POST https://api.usergrid.com/<org>/<app>/<collection_name>
+
+Parameters
+
+Parameter	    Description
+---------       -----------
+org	            Organization UUID or organization name
+app	            Application UUID or application name
+collection name	Name of the collection to create. 
+
+If the provided value is not a plural word, Usergrid will pluralize it. For example, providing 'item' will create a collection named 'items' but providing 'items' will not create 'itemses'.
+
+### Example Request/Response
+
+Request:
+
+    curl -X POST "https://api.usergrid.com/your-org/your-app/item"
+
+Response:
+
+    {
+      "action" : "post",
+      "application" : "f34f4222-a166-11e2-a7f7-02e81adcf3d0",
+      "params" : { },
+      "path" : "/items",
+      "uri" : "http://api.usergrid.com/your-org/your-app/items",
+      "entities" : [ ],
+      "timestamp" : 1378857079220,
+      "duration" : 31,
+      "organization" : "your-org",
+      "applicationName" : "your-app"
+    }
+  
+## Retrieving Collections
+
+This article describes how to retrieve all of the entities in a collection.
+
+<div class="admonition note"> <p class="first admonition-title">Note</p> <p class="last">
By default, the Usergrid API returns 10 entities per request. For collections with more than 10 entities, use the returned 'cursor' property to retrieve the next 10 entities in the result set. You may also use the LIMIT parameter in a query string to increase the number of results returned. For more information on using cursors, see [Query Parameters](../data-queries/query-parameters.html).</p></div>
+
+__Note__: Although not shown in the API examples below, you need to provide a valid access token with each API call. See Authenticating users and application clients for details.
+
+### Retrieving sets of entities from a collection
+
+### Request Syntax
+
+    curl -X GET https://api.usergrid.com/<org>/<app>/<collection>
+    
+Parameters
+
+Parameter	Description
+---------   -----------
+org	        Organization UUID or organization name
+app	        Application UUID or application name
+collection	Collection UUID or collection name
+
+### Example Request/Response
+
+Request:
+
+    curl -X GET "https://api.usergrid.com/your-org/your-app/items"
+
+Response:
+
+    {
+          "action" : "get",
+          "application" : "f34f4222-a166-11e2-a7f7-02e81adcf3d0",
+          "params" : { },
+          "path" : "/items",
+          "uri" : "http://api.usergrid.com/your-org/your-app/items",
+          "entities" : [ {
+                "uuid" : "5bb76bca-1657-11e3-903f-9ff6c621a7a4",
+                "type" : "item",
+                "name" : "milk",
+                "created" : 1378405020796,
+                "modified" : 1378405020796,
+                "metadata" : {
+                      "path" : "/items/5bb76bca-1657-11e3-903f-9ff6c621a7a4"
+                },
+                "name" : "milk",
+                "price" : "3.25"
+          }, {
+            "uuid" : "1a9356ba-1682-11e3-a72a-81581bbaf055",
+            "type" : "item",
+            "name" : "bread",
+            "created" : 1378423379867,
+            "modified" : 1378423379867,
+            "metadata" : {
+                  "path" : "/items/1a9356ba-1682-11e3-a72a-81581bbaf055"
+            },
+            "name" : "bread",
+            "price" : "2.50"
+          } ],
+          "timestamp" : 1378426821261,
+          "duration" : 35,
+          "organization" : "your-org",
+          "applicationName" : "your-app",
+          "count" : 2
+    }   
+    
+## Updating Collections
+
+This article describes how to perform batch updates on all entities in a collection. Batch updates require the use of a query string in the request, which can either specify all entities in the collection or a subset of entities for the update to be performed on. For more information on queries, see Querying your data.
+
+__Note__: Although not shown in the API examples below, you need to provide a valid access token with each API call. See Authenticating users and application clients for details.
+
+### Batch updating entities in a collection
+
+### Request Syntax
+
+    curl -X PUT https://api.usergrid.com/<org>/<app>/<collection>/?ql= -d {<property>}
+
+Note the empty query string (ql=) appended to the URL.
+
+Parameters
+
+Parameter	Description
+---------   -----------
+org	        Organization UUID or organization name
+app	        Application UUID or application name
+collection	Collection UUID or collection name property	
+
+An entity property to be updated, formatted as a key-value pair. For example:
+
+    {"property_1":"value_1", "property_2":"value_2",...}
+
+### Example Request/Response
+
+Request:
+
+    curl -X PUT https://api.usergrid.com/your-org/your-app/items/?ql= -d '{"availability":"in-stock"}'
+
+Note the empty ?ql= query string.
+
+Response:
+
+    {
+      "action" : "put",
+      "application" : "f34f4222-a166-11e2-a7f7-02e81adcf3d0",
+      "params" : {
+        "ql" : [ "" ]
+      },
+      "path" : "/items",
+      "uri" : "http://api.usergrid.com/your-org/your-app/items",
+      "entities" : [ {
+        "uuid" : "31847b9a-1a62-11e3-be04-8d05e96f700d",
+        "type" : "item",
+        "name" : "milk",
+        "price" : "3.25",
+        "availability" : "in-stock"
+        "created" : 1378849479113,
+        "modified" : 1378849567301,
+        "name" : "milk",
+      }, {
+        "uuid" : "3192ac6a-1a62-11e3-a24f-496ca1d42ce7",
+        "type" : "item",
+        "name" : "bread",
+        "price" : "4.00",
+        "availability" : "in-stock"
+        "created" : 1378849479206,
+        "modified" : 1378849567351,
+        "name" : "bread",
+      } ],
+      "timestamp" : 1378849567280,
+      "duration" : 207,
+      "organization" : "your-org",
+      "applicationName" : "your-app"
+    }
+   
+## Deleting Collections
+This article describes how to batch delete entities in a collection. Batch deletes require the use of a query string in the request, which specifies a subset of entities to be deleted. For more information on queries, see Querying your data.
+
+Currently, collections cannot be deleted; however, you can delete all of the entities from a collection.
+
+__Note__: Although not shown in the API examples below, you need to provide a valid access token with each API call. See Authenticating users and application clients for details.
+
+### Batch deleting entities in a collection
+
+### Request Syntax
+
+    curl -X DELETE https://api.usergrid.com/<org>/<app>/<collection>/?ql=<query>
+    
+Parameters
+
+Parameter	Description
+---------   -----------
+org	        Organization UUID or organization name
+app	        Application UUID or application name
+collection	Collection UUID or collection name
+query	    A query string that specifies the subset of entities to delete 
+
+(for more information on queries, see Querying your data)
+
+### Example Request/Response
+
+The following example will delete the first 5 entities in a collection.
+
+Request:
+
+    curl -X DELETE https://api.usergrid.com/your-org/your-app/items/?ql="limit=5"
+    
+Response:
+
+    {
+      "action" : "delete",
+      "application" : "f34f4222-a166-11e2-a7f7-02e81adcf3d0",
+      "params" : {
+        "ql" : [ "" ]
+      },
+      "path" : "/items",
+      "uri" : "http://api.usergrid.com/your-org/your-app/items",
+      "entities" : [ {
+        "uuid" : "53fe3700-0abe-11e3-b1f7-1bd100b8059e",
+        "type" : "item",
+        "name" : "milk",
+        "price" : "3.25",
+        "created" : 1377129832047,
+        "modified" : 1377129832047,
+        "metadata" : {
+          "path" : "/items/53fe3700-0abe-11e3-b1f7-1bd100b8059e"
+        },
+        "name" : "milk"
+      }, {
+        "uuid" : "5ae1fa7a-0abe-11e3-89ab-6be0003c809b",
+        "type" : "item",
+        "name" : "bread",
+        "price" : "4.00",
+        "created" : 1377129843607,
+        "modified" : 1377129843607,
+        "metadata" : {
+          "path" : "/items/5ae1fa7a-0abe-11e3-89ab-6be0003c809b"
+        },
+        "name" : "bread"
+      } ],
+      "timestamp" : 1378848117272,
+      "duration" : 12275,
+      "organization" : "your-org",
+      "applicationName" : "your-app"
+    }
+    
+    
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/data-storage/data-store-dbms.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/data-storage/data-store-dbms.txt b/content/docs/_sources/data-storage/data-store-dbms.txt
new file mode 100644
index 0000000..539cca6
--- /dev/null
+++ b/content/docs/_sources/data-storage/data-store-dbms.txt
@@ -0,0 +1,109 @@
+# The Usergrid Data Store
+
+The Usergrid data store is backed by Cassandra, an open source distributed DBMS. Cassandra isn’t a relational database system (RDBMS), and is sometimes placed in the category of “NoSQL” or “schema-less” databases. 
+
+<!-- workaround a Sphinx bug -->
+<div class="admonition note"> <p class="first admonition-title">Note</p> <p class="last">
+Usergrid is not a relational database. Optimizing for performance on a non-relational database like Cassandra differs a bit from relational databases. For more information, see Optimizing access to your Usergrid data store.</p> </div>
+
+
+Cassandra is specifically designed to support applications that need flexibility and high scalability, particularly web and mobile applications. Usergrid client applications write and read data formatted as JavaScript Object Notation (JSON). (Usergrid provides SDKs through which client apps can do much of this work in their native language. For more information, see Usergrid SDKs.)
+
+With Cassandra as the underlying DBMS, apps benefit from:
+
+Fast writes to the data store.
+* A distributed architecture that means no single point of failure.
+* Flexibility in data model design. You aren't constrained by a schema.
+* Linear scalability.
+
+If you have experience with relational databases and are unfamiliar with "NoSQL" databases, the following table might be a helpful start. It maps the high-level concepts of an RDBMS’s data model both to Cassandra’s and to the Usergrid, which is backed by Cassandra.
+
+<table class="usergrid-table">
+<tr>
+    <td></td>
+    <td>RDBMS</td>
+    <td>Cassandra</td>
+    <td>Usergrid</td>
+</tr>
+<tr>
+    <td>Each tuple is modeled as</td>
+    <td>A row.</td>
+    <td>A row.</td>
+    <td>An entity. Written and retrieved as JSON, an entity contains values for all of its properties in the way a row has values for columns.</td>
+</tr>
+<tr>
+    <td>Each data attribute is modeled as</td>
+    <td>A column.</td>
+    <td>A column. Many thousands of columns are supported.</td>
+    <td>A entity property. An entity has a default set of properties, including the entity’s UUID. You can add many more to support your application.</td>
+</tr>
+<tr>
+    <td>Each group of attributes is modeled as</td>
+    <td>A table.</td>
+    <td>A column family. Unlike rows in tables, rows in a column family can have differing numbers of columns. Because you’re not using a schema to define the model, you can update the column list for a row at any time.</td>
+    <td>An entity collection. As with its underlying Cassandra column family, a collection can have entities with differing numbers of properties. In other words, just because one entity has an authorId property doesn’t mean that other entities in its collection need to.</td>
+</tr>
+</table>
+
+The following examples from a product database provide simple illustrations of these differences.
+
+An RDBMS table has a schema-defined set of columns per row.
+
+.. image:: rdbms.png
+
+A Cassandra column family includes rows that can have differing column sets.
+
+.. image:: cassandra.png
+   
+In the JSON from the Usergrid application, the products are represented as entities. Note that each entity in the entities array below has a slightly different set of properties, like the columns in a Cassandra column family.
+
+    { 
+        "action" : "get", 
+        "application" : "<app_uuid>", 
+        "params" : {}, 
+        "path" : "/products", 
+        "uri" : "https://api.usergrid.com/my_org/my_app/products", 
+        "entities" : [ { 
+            "uuid" : "<product_uuid>", 
+            "type" : "product", 
+            "created" : 1395410098517, 
+            "modified" : 1395410098517, 
+            "image" : "http://path.jpg", 
+            "metadata" : { 
+                "path" : "/products/<product_uuid>" 
+            }, 
+            "name" : "Bouncy Castle", 
+            "sku" : "35450349822" 
+        }, 
+        {
+            "uuid" : "<product_uuid>", 
+            "type" : "product", 
+            "created" : 1395409669686, 
+            "modified" : 1395409669686, 
+            "image" : "http://path.jpg", 
+            "metadata" : { 
+                "path" : "/products/<product_uuid>" 
+            }, 
+            "description" : "It makes coffee.", 
+            "name" : "Coffee Maker", 
+            "sku" : "60723023589" 
+        }, 
+        { 
+            "uuid" : "<product_uuid>", 
+            "type" : "product",
+            "created" : 1395407700578, 
+            "modified" : 1395407700578, 
+            "metadata" : { 
+                "path" : "/products/<product_uuid>" 
+            }, 
+            "name" : "Air Mattress", 
+            "sku" : "53045985365" 
+        }],
+        "timestamp" : 1396290037640, 
+        "duration" : 91, 
+        "organization" : "my_org", 
+        "applicationName" : "my_app", 
+        "count" : 3 
+    }
+    
+    
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/data-storage/entities.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/data-storage/entities.txt b/content/docs/_sources/data-storage/entities.txt
new file mode 100644
index 0000000..5a70b18
--- /dev/null
+++ b/content/docs/_sources/data-storage/entities.txt
@@ -0,0 +1,512 @@
+# Entities
+
+## Creating Custom Data Entities
+This article describes how to create custom data entities and entity properties. Entity types correspond to the name of collection to which they are posted. For example, if you create a new custom "dog" entity, a "dogs" collection will be created if one did not already exist. If a "dogs" collection already exists, the new "dog" entity will be saved in it. All user-defined properties are indexed, and strings that contain multiple words are keyword-indexed.
+
+The methods cited in this article should be used to create custom data entities. If you are using one of the Usergrid SDKs, use one of the entity type-specific SDK methods to create default data entities.
+
+__Note__: Although not shown in the API examples below, you need to provide a valid access token with each API call. See Authenticating users and application clients for details.
+
+### Creating a custom entity
+When a new entity is created, Usergrid will automatically create a corresponding collection if one does not already exist. The collection will automatically be named with the plural form of the entity type. For example, creating a custom entity of type 'item' will automatically create a collection named 'items' in which all future 'item' entities will be saved.
+
+### Request Syntax
+
+    curl -X POST https://api.usergrid.com/<org>/<app>/<entity_type> -d 'json_object'
+
+Parameters
+
+Parameter	Description
+---------   -----------
+org	        Organization UUID or organization name
+app	        Application UUID or application name
+entity_type	Entity type to create. 
+json_object JSON representation of entity properties
+
+(For a full list of default properties, see Default Data Entity Types)
+
+Usergrid will create a corresponding collection if one does not already exist. To add an entity to an existing collections, use the pluralized collection name for entity_type.
+
+### Example Request/Response
+
+Request:
+
+    curl -X POST "https://api.usergrid.com/your-org/your-app/item" -d '{"name":"milk", "price":"3.25"}'
+    
+Response:
+
+    { 
+        "action" : "post", 
+        "application" : "4a1edb70-d7a8-11e2-9ce3-f315e5aa568a", 
+        "params" : { }, 
+        "path" : "/items", "uri" : "http://api.usergrid.com/my-org/my-app/items", 
+        "entities" : [ { 
+            "uuid" : "83e9b7ea-e8f5-11e2-84df-e94123890c7a", 
+            "type" : "item", 
+            "name" : "milk", 
+            "created" : 1373415195230, 
+            "modified" : 1373415195230, 
+            "metadata" : { 
+
+                "path" : "/items/83e9b7ea-e8f5-11e2-84df-e94123890c7a" 
+            }, 
+            "name" : "milk", 
+            "price" : "3.25"
+        } ], 
+        "timestamp" : 1373415195225, 
+        "duration" : 635, 
+        "organization" : "my-org", 
+        "applicationName" : "my-app" 
+    }
+    
+## Creating multiple custom entities
+
+### Request Syntax
+
+    curl -X POST https://api.usergrid.com/<org>/<app>/<entity_type>/ -d 'json_array'
+    
+Parameters
+
+Parameter	Description
+---------   -----------
+org	        Organization UUID or name
+app	        Application UUID or name
+entity_type	Custom entity type to create. 
+json_array  JSON array of entities to be created.
+
+Usergrid will create a corresponding collection if one does not already exist. To add an entity to an existing collections, use the collection name or collection UUID in place of the entity type.
+
+### Example Request/Response
+
+Request:
+
+    curl -X POST "https://api.usergrid.com/your-org/your-app/item" -d '[{"name":"milk", "price":"3.25"}, {"name":"bread", "price":"2.50"}]'
+    
+Response:
+
+    {
+        "action" : "post",
+        "application" : "f34f4222-a166-11e2-a7f7-02e9sjwsf3d0",
+        "params" : { },
+        "path" : "/items",
+        "uri" : "http://api.usergrid.com/your-org/your-app/items",
+        "entities" : [ {
+            "uuid" : "f3a8061a-ef0b-11e2-9e92-5f4a65c16193",
+            "type" : "item",
+            "name" : "milk",
+            "price" : "3.25",
+            "created" : 1374084538609,
+            "modified" : 1374084538609,
+            "metadata" : {
+                "path" : "/multis/f3a8061a-ef0b-11e2-9e92-5f4a65c16193"
+            },
+            "name" : "milk"
+        }, {
+            "uuid" : "f3be262a-ef0b-11e2-a51b-6715d5ef47a6",
+            "type" : "item",
+            "name" : "bread",
+            "price" : "2.50",
+            "created" : 1374084538754,
+            "modified" : 1374084538754,
+            "metadata" : {
+                "path" : "/items/f3be262a-ef0b-11e2-a51b-6715d5ef47a6"
+            },
+            "name" : "bread"
+        } ],
+        "timestamp" : 1374084538584,
+        "duration" : 388,
+        "organization" : "your-org",
+        "applicationName" : "your-app"
+    }
+
+### Creating an entity with sub-properties
+
+Any valid JSON object can be stored in an entity, regardless of the level of complexity, including sub-properties. For example, suppose you have an 'items' collection that contains an entity named 'milk'. You might store the different varieties of milk as sub-properties of a 'varieties' property:
+
+    {
+        "type" : "item"
+        "name" : "milk"
+        "varieties" : [ {
+            "name" : "1%",
+            "price" : "3.25",
+            "sku" : "0393847575533445"
+        }, {
+            "name" : "whole",
+            "price" : "3.85",
+            "sku" : "0393394956788445"
+        }, {
+            "name" : "skim",
+            "price" : "4.00",
+            "sku" : "0390299933488445"		
+        } ]
+    }		
+	
+### Updating sub-properties
+
+An array of sub-properties is treated as a single object. This means that sub-properties cannot be updated atomically. All sub-properties of a given property must be updated as a set.
+For more on updating an existing sub-property, see Updating Data Entities.
+
+Example Request/Response
+
+    Request:
+    //Note the use of square brackets for specifying multiple nested objects
+    curl -X POST "https://api.usergrid.com/your-org/your-app/items" -d '{"varieties":[{"name":"1%","price" : "3.25", "sku" : "0393847575533445"},{"name" : "whole", "price" : "3.85", "sku" : "0393394956788445"}, {"name" : "skim", "price" : "4.00", "sku" : "0390299933488445"}]}'
+    Response:
+    { 
+        "action" : "post", 
+        "application" : "f34f4222-a166-11e2-a7f7-02e81adcf3d0", 
+        "params" : { }, 
+        "path" : "/items", 
+        "uri" : "http://api.usergrid.com/your-org/your-app/items", 
+        "entities" : [ { 
+            "uuid" : "0d7cf92a-effb-11e2-917d-c5e707256e71", 
+            "type" : "item", 
+            "name" : "milk", 
+            "created" : 1374187231666, 
+            "modified" : 1374187231666, 
+            "metadata" : { 
+                "path" : "/items/0d7cf92a-effb-11e2-917d-c5e707256e71" 
+            }, 
+            "name" : "milk", 
+            "varieties" : [ { 
+                "name" : "1%", 
+                "price" : "3.25", 
+                "SKU" : "0393847575533445" 
+            }, { 
+                "name" : "whole", 
+                "price" : "3.85", 
+                "SKU" : "0393394956788445" 
+            }, { 
+                "name" : "skim", 
+                "price" : "4.00", 
+                "SKU" : "0390299933488445" 
+            } ] 
+        } ], 
+        "timestamp" : 1374187450826, 
+        "duration" : 50, 
+        "organization" : "your-org", 
+        "applicationName" : "your-app" 
+    }
+
+.. -----------------------------------------------------------------------------
+
+## Retrieving Data Entities
+This article describes how to retrieve entities from your account.
+
+__Note__: Although not shown in the API examples below, you need to provide a valid access token with each API call. See Authenticating users and application clients for details.
+
+With the exception of the user entity, all data entities can be retrieved by using their UUID or a 'name' property. The user entity can be retrieved by UUID or the 'username' property. The value for the 'name' or 'username' property must be unique.
+
+### Retrieving an entity
+
+### Request Syntax
+
+    curl -X GET https://api.usergrid.com/<org>/<app>/<collection>/<entity>
+
+Parameters
+
+Parameter	Description
+---------   -----------
+org	        Organization UUID or organization name
+app	        Application UUID or application name
+collection	Collection UUID or collection name
+entity	    Entity UUID or entity name
+
+### Example Request/Response
+
+Request:
+
+Retrieve by UUID:
+
+    curl -X GET "https://api.usergrid.com/your-org/your-app/items/da4a50dc-38dc-11e2-b2e4-02e81adcf3d0"
+    
+Retrieve by 'name' property:
+
+    curl -X GET "https://api.usergrid.com/your-org/your-app/items/milk"
+    
+Response:
+
+    {
+        "action" : "get",
+        "application" : "f34f4222-a166-11e2-a7f7-02e81adcf3d0",
+        "params" : { },
+        "path" : "/items",
+        "uri" : "http://api.usergrid.com/amuramoto/sandbox/items",
+        "entities" : [ {
+            "uuid" : "5bb76bca-1657-11e3-903f-9ff6c621a7a4",
+            "type" : "item",
+            "name" : "milk",
+            "created" : 1378405020796,
+            "modified" : 1378405020796,
+            "metadata" : {
+                  "path" : "/items/5bb76bca-1657-11e3-903f-9ff6c621a7a4"
+            },
+            "name" : "milk",
+            "price" : "3.25"
+        } ],
+        "timestamp" : 1378405025763,
+        "duration" : 31,
+        "organization" : "amuramoto",
+        "applicationName" : "sandbox"
+    }
+
+### Retrieving multiple entities
+
+This example describes how to retrieve multiple entities by UUID. You can also retrieve a set of entities by using a query string. For more information on querying your data, see Querying your data.
+
+### Request Syntax
+
+    curl -X GET https://api.usergrid.com/<org_id>/<app_id>/<collection>?ql= uuid = <entity_uuid> OR uuid = <entity_uuid>; ...
+    
+Parameters
+
+Parameter	Description
+---------   -----------
+org_id	    Organization UUID or organization name
+app_id	    Application UUID or application name
+collection	Collection UUID or collection name
+query	    A url-encoded query string of entity properties to be matched.
+ 
+The query must be in Usergrid Query Language, for example:
+
+    ?ql=uuid="<entity_uuid>"" OR name="<entity_name>" OR...
+    
+You may also specify the following for certain entity types:
+
+User entities: username = <entity_username>
+
+All other entities except groups: name = <entity_name>
+
+### Example Request/Response
+
+Request:
+
+    //note the url-encoded query string
+    curl -X GET "https://api.usergrid.com/your-org/your-app/items?ql=name%3D'milk'%20OR%20UUID%3D1a9356ba-1682-11e3-a72a-81581bbaf055&limit="				
+
+Note: The query parameter of the request must be url encoded for curl requests
+
+Response:
+
+    {
+          "action" : "get",
+          "application" : "f34f4222-a166-11e2-a7f7-02e81adcf3d0",
+          "params" : {
+                "ql" : [ "name='milk' OR UUID=1a9356ba-1682-11e3-a72a-81581bbaf055" ]
+          },
+          "path" : "/items",
+          "uri" : "http://api.usergrid.com/your-org/your-app/items",
+          "entities" : [ {
+                "uuid" : "5bb76bca-1657-11e3-903f-9ff6c621a7a4",
+                "type" : "item",
+                "name" : "milk",
+                "created" : 1378405020796,
+                "modified" : 1378405020796,
+                "metadata" : {
+                      "path" : "/items/5bb76bca-1657-11e3-903f-9ff6c621a7a4"
+            },
+                "name" : "milk",
+                "price" : "3.25"
+          }, {
+            "uuid" : "1a9356ba-1682-11e3-a72a-81581bbaf055",
+            "type" : "item",
+            "name" : "bread",
+            "created" : 1378423379867,
+            "modified" : 1378423379867,
+            "metadata" : {
+                  "path" : "/items/1a9356ba-1682-11e3-a72a-81581bbaf055"
+            },
+                "name" : "bread",
+                "price" : "2.50"
+          } ],
+          "timestamp" : 1378423793729,
+          "duration" : 63,
+          "organization" : "your-org",
+          "applicationName" : "your-app",
+          "count" : 2
+    }
+ 
+ 
+.. --------------------------------------------------------------------------------
+
+## Updating Data Entities
+
+This article describes how to update entities in your account.
+
+__Note__: Although not shown in the API examples below, you need to provide a valid access token with each API call. See Authenticating users and application clients for details.
+
+### Updating an entity
+One or more properties can be updated with a single PUT request. For information on updating sub-properties, see Updating sub-properties below.
+
+### Request Syntax
+
+    curl -X PUT https://api.usergrid.com/<org>/<app>/<collection>/<entity> -d {<property>}
+    
+Parameters
+
+Parameter	Description
+---------   -----------
+org_id	    Organization UUID or organization name
+app_id	    Application UUID or application name
+collection	Name of the collection containing the entity to be updated
+uuid|name	UUID or name of the data entity to be updated
+json_object JSON object with a field for each property to be updated
+
+An entity property to be updated, formatted as a key-value pair. For example:
+
+    {"property_1":"value_1", "property_2":"value_2",...}
+
+### Example Request/Response
+
+Request:
+
+    curl -X PUT https://api.usergrid.com/your-org/your-app/items/milk -d '{"price":"4.00", "availability":"in-stock"}'
+
+Response:
+
+    {
+      "action" : "put",
+      "application" : "f34f4222-a166-11e2-a7f7-02e81adcf3d0",
+      "params" : { },
+      "path" : "/items",
+      "uri" : "http://api.usergrid.com/your-org/your-app/items",
+      "entities" : [ {
+        "uuid" : "5bb76bca-1657-11e3-903f-9ff6c621a7a4",
+        "type" : "item",
+        "name" : "milk",
+        "created" : 1378405020796,
+        "modified" : 1378505705077,
+        "availability" : "in-stock",
+        "metadata" : {
+          "path" : "/items/5bb76bca-1657-11e3-903f-9ff6c621a7a4"
+        },
+        "name" : "milk",
+        "price" : "4.00"
+      } ],
+      "timestamp" : 1378505705050,
+      "duration" : 87,
+      "organization" : "your-org",
+      "applicationName" : "your-app"
+    }
+
+
+### Updating a sub-property
+
+Data entities may contain sets of sub-properties as nested JSON objects. Unlike normal entity properties, however, sub-properties cannot be updated individually. Updating a nested object will cause all sub-properties within it to be overwritten.
+
+For example, if you have a data entity with the following nested object:
+
+### Request Syntax
+
+    curl -X PUT https://api.usergrid.com/<org_id>/<app_id>/<collection>/<uuid|name> -d '{<property> : [{<sub_property>}, {<sub_property>}...]}'
+
+Parameters
+
+Parameter	Description
+---------   -----------
+org_id	    Organization UUID or organization name
+app_id	    Application UUID or application name
+collection	Name of the collection containing the entity to be updated
+uuid|name	UUID or name of the data entity to be updated
+json_object JSON object with a field for each property to be updated
+
+### Example Request/Response
+
+Request:
+
+    curl -X PUT https://api.usergrid.com/your-org/your-app/items/milk -d '{"varieties":[{"name":"1%","price":"3.25"},{"name":"whole","price":"4.00"}]}'
+
+Response:
+
+    {
+      "action" : "put",
+      "application" : "f34f4222-a166-11e2-a7f7-02e81adcf3d0",
+      "params" : { },
+      "path" : "/items",
+      "uri" : "http://api.usergrid.com/your-org/your-app/items",
+      "entities" : [ {
+        "uuid" : "5bb76bca-1657-11e3-903f-9ff6c621a7a4",
+        "type" : "item",
+        "name" : "milk",
+        "created" : 1378405020796,
+        "modified" : 1378761459069,
+        "availability" : "in-stock",
+        "metadata" : {
+          "path" : "/items/5bb76bca-1657-11e3-903f-9ff6c621a7a4"
+        },
+        "name" : "milk",
+        "uri" : "http://api.usergrid.com/your-org/your-app/items/5bb76bca-1657-11e3-903f-9ff6c621a7a4",
+        "varieties" : [ {
+          "name" : "1%",
+          "price" : "3.25"
+        }, {
+          "name" : "whole",
+          "price" : "4.00"
+        } ]
+      } ],
+      "timestamp" : 1378761459047,
+      "duration" : 62,
+      "organization" : "your-org",
+      "applicationName" : "your-app"
+    }
+ 
+## Deleting Data Entities
+
+This article describes how to delete data entities.
+
+__Note__:Although not shown in the API examples below, you need to provide a valid access token with each API call. See Authenticating users and application clients for details.
+
+### Deleting an entity
+
+### Request Syntax
+
+    curl -X DELETE https://api.usergrid.com/<org>/<app>/<collection>/<entity>
+    
+Parameters
+
+Parameter	Description
+---------   -----------
+org	        Organization UUID or organization name
+app	        Application UUID or application name
+collection	Collection UUID or collection name
+entity	    Entity UUID or entity name
+
+### Example Request/Response
+ 
+Request:
+ 
+Delete by UUID:
+ 
+    curl -X DELETE "https://api.usergrid.com/your-org/your-app/items/da4a50dc-38dc-11e2-b2e4-02e81adcf3d0" 
+    
+Delete by 'name' property:
+ 
+     curl -X DELETE "https://api.usergrid.com/your-org/your-app/items/milk"
+ 
+Response:
+ 
+     {
+       "action" : "delete",
+       "application" : "f34f4222-a166-11e2-a7f7-02e81adcf3d0",
+       "params" : { },
+       "path" : "/items",
+       "uri" : "http://api.usergrid.com/your-org/your-app/items",
+       "entities" : [ {
+         "uuid" : "328fe64a-19a0-11e3-8a2a-ebc6f49d1fc4",
+         "type" : "item",
+         "name" : "milk",
+         "created" : 1378766158500,
+         "modified" : 1378766158500,
+         "metadata" : {
+           "path" : "/items/328fe64a-19a0-11e3-8a2a-ebc6f49d1fc4"
+         },
+         "name" : "milk",
+         "price" : "3.25"
+       } ],
+       "timestamp" : 1378766172016,
+       "duration" : 324,
+       "organization" : "your-org",
+       "applicationName" : "your-app"
+     }
+  
+ 
\ No newline at end of file

[29/60] [abbrv] incubator-usergrid git commit: cherry picking docs from master

[sn...@apache.org]

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_static/fonts/fontawesome-webfont.woff
----------------------------------------------------------------------
diff --git a/content/docs/_static/fonts/fontawesome-webfont.woff b/content/docs/_static/fonts/fontawesome-webfont.woff
new file mode 100644
index 0000000..8c1748a
Binary files /dev/null and b/content/docs/_static/fonts/fontawesome-webfont.woff differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_static/jquery-1.11.1.js
----------------------------------------------------------------------
diff --git a/content/docs/_static/jquery-1.11.1.js b/content/docs/_static/jquery-1.11.1.js
new file mode 100644
index 0000000..d4b67f7
--- /dev/null
+++ b/content/docs/_static/jquery-1.11.1.js
@@ -0,0 +1,10308 @@
+/*!
+ * jQuery JavaScript Library v1.11.1
+ * http://jquery.com/
+ *
+ * Includes Sizzle.js
+ * http://sizzlejs.com/
+ *
+ * Copyright 2005, 2014 jQuery Foundation, Inc. and other contributors
+ * Released under the MIT license
+ * http://jquery.org/license
+ *
+ * Date: 2014-05-01T17:42Z
+ */
+
+(function( global, factory ) {
+
+	if ( typeof module === "object" && typeof module.exports === "object" ) {
+		// For CommonJS and CommonJS-like environments where a proper window is present,
+		// execute the factory and get jQuery
+		// For environments that do not inherently posses a window with a document
+		// (such as Node.js), expose a jQuery-making factory as module.exports
+		// This accentuates the need for the creation of a real window
+		// e.g. var jQuery = require("jquery")(window);
+		// See ticket #14549 for more info
+		module.exports = global.document ?
+			factory( global, true ) :
+			function( w ) {
+				if ( !w.document ) {
+					throw new Error( "jQuery requires a window with a document" );
+				}
+				return factory( w );
+			};
+	} else {
+		factory( global );
+	}
+
+// Pass this if window is not defined yet
+}(typeof window !== "undefined" ? window : this, function( window, noGlobal ) {
+
+// Can't do this because several apps including ASP.NET trace
+// the stack via arguments.caller.callee and Firefox dies if
+// you try to trace through "use strict" call chains. (#13335)
+// Support: Firefox 18+
+//
+
+var deletedIds = [];
+
+var slice = deletedIds.slice;
+
+var concat = deletedIds.concat;
+
+var push = deletedIds.push;
+
+var indexOf = deletedIds.indexOf;
+
+var class2type = {};
+
+var toString = class2type.toString;
+
+var hasOwn = class2type.hasOwnProperty;
+
+var support = {};
+
+
+
+var
+	version = "1.11.1",
+
+	// Define a local copy of jQuery
+	jQuery = function( selector, context ) {
+		// The jQuery object is actually just the init constructor 'enhanced'
+		// Need init if jQuery is called (just allow error to be thrown if not included)
+		return new jQuery.fn.init( selector, context );
+	},
+
+	// Support: Android<4.1, IE<9
+	// Make sure we trim BOM and NBSP
+	rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,
+
+	// Matches dashed string for camelizing
+	rmsPrefix = /^-ms-/,
+	rdashAlpha = /-([\da-z])/gi,
+
+	// Used by jQuery.camelCase as callback to replace()
+	fcamelCase = function( all, letter ) {
+		return letter.toUpperCase();
+	};
+
+jQuery.fn = jQuery.prototype = {
+	// The current version of jQuery being used
+	jquery: version,
+
+	constructor: jQuery,
+
+	// Start with an empty selector
+	selector: "",
+
+	// The default length of a jQuery object is 0
+	length: 0,
+
+	toArray: function() {
+		return slice.call( this );
+	},
+
+	// Get the Nth element in the matched element set OR
+	// Get the whole matched element set as a clean array
+	get: function( num ) {
+		return num != null ?
+
+			// Return just the one element from the set
+			( num < 0 ? this[ num + this.length ] : this[ num ] ) :
+
+			// Return all the elements in a clean array
+			slice.call( this );
+	},
+
+	// Take an array of elements and push it onto the stack
+	// (returning the new matched element set)
+	pushStack: function( elems ) {
+
+		// Build a new jQuery matched element set
+		var ret = jQuery.merge( this.constructor(), elems );
+
+		// Add the old object onto the stack (as a reference)
+		ret.prevObject = this;
+		ret.context = this.context;
+
+		// Return the newly-formed element set
+		return ret;
+	},
+
+	// Execute a callback for every element in the matched set.
+	// (You can seed the arguments with an array of args, but this is
+	// only used internally.)
+	each: function( callback, args ) {
+		return jQuery.each( this, callback, args );
+	},
+
+	map: function( callback ) {
+		return this.pushStack( jQuery.map(this, function( elem, i ) {
+			return callback.call( elem, i, elem );
+		}));
+	},
+
+	slice: function() {
+		return this.pushStack( slice.apply( this, arguments ) );
+	},
+
+	first: function() {
+		return this.eq( 0 );
+	},
+
+	last: function() {
+		return this.eq( -1 );
+	},
+
+	eq: function( i ) {
+		var len = this.length,
+			j = +i + ( i < 0 ? len : 0 );
+		return this.pushStack( j >= 0 && j < len ? [ this[j] ] : [] );
+	},
+
+	end: function() {
+		return this.prevObject || this.constructor(null);
+	},
+
+	// For internal use only.
+	// Behaves like an Array's method, not like a jQuery method.
+	push: push,
+	sort: deletedIds.sort,
+	splice: deletedIds.splice
+};
+
+jQuery.extend = jQuery.fn.extend = function() {
+	var src, copyIsArray, copy, name, options, clone,
+		target = arguments[0] || {},
+		i = 1,
+		length = arguments.length,
+		deep = false;
+
+	// Handle a deep copy situation
+	if ( typeof target === "boolean" ) {
+		deep = target;
+
+		// skip the boolean and the target
+		target = arguments[ i ] || {};
+		i++;
+	}
+
+	// Handle case when target is a string or something (possible in deep copy)
+	if ( typeof target !== "object" && !jQuery.isFunction(target) ) {
+		target = {};
+	}
+
+	// extend jQuery itself if only one argument is passed
+	if ( i === length ) {
+		target = this;
+		i--;
+	}
+
+	for ( ; i < length; i++ ) {
+		// Only deal with non-null/undefined values
+		if ( (options = arguments[ i ]) != null ) {
+			// Extend the base object
+			for ( name in options ) {
+				src = target[ name ];
+				copy = options[ name ];
+
+				// Prevent never-ending loop
+				if ( target === copy ) {
+					continue;
+				}
+
+				// Recurse if we're merging plain objects or arrays
+				if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) {
+					if ( copyIsArray ) {
+						copyIsArray = false;
+						clone = src && jQuery.isArray(src) ? src : [];
+
+					} else {
+						clone = src && jQuery.isPlainObject(src) ? src : {};
+					}
+
+					// Never move original objects, clone them
+					target[ name ] = jQuery.extend( deep, clone, copy );
+
+				// Don't bring in undefined values
+				} else if ( copy !== undefined ) {
+					target[ name ] = copy;
+				}
+			}
+		}
+	}
+
+	// Return the modified object
+	return target;
+};
+
+jQuery.extend({
+	// Unique for each copy of jQuery on the page
+	expando: "jQuery" + ( version + Math.random() ).replace( /\D/g, "" ),
+
+	// Assume jQuery is ready without the ready module
+	isReady: true,
+
+	error: function( msg ) {
+		throw new Error( msg );
+	},
+
+	noop: function() {},
+
+	// See test/unit/core.js for details concerning isFunction.
+	// Since version 1.3, DOM methods and functions like alert
+	// aren't supported. They return false on IE (#2968).
+	isFunction: function( obj ) {
+		return jQuery.type(obj) === "function";
+	},
+
+	isArray: Array.isArray || function( obj ) {
+		return jQuery.type(obj) === "array";
+	},
+
+	isWindow: function( obj ) {
+		/* jshint eqeqeq: false */
+		return obj != null && obj == obj.window;
+	},
+
+	isNumeric: function( obj ) {
+		// parseFloat NaNs numeric-cast false positives (null|true|false|"")
+		// ...but misinterprets leading-number strings, particularly hex literals ("0x...")
+		// subtraction forces infinities to NaN
+		return !jQuery.isArray( obj ) && obj - parseFloat( obj ) >= 0;
+	},
+
+	isEmptyObject: function( obj ) {
+		var name;
+		for ( name in obj ) {
+			return false;
+		}
+		return true;
+	},
+
+	isPlainObject: function( obj ) {
+		var key;
+
+		// Must be an Object.
+		// Because of IE, we also have to check the presence of the constructor property.
+		// Make sure that DOM nodes and window objects don't pass through, as well
+		if ( !obj || jQuery.type(obj) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) {
+			return false;
+		}
+
+		try {
+			// Not own constructor property must be Object
+			if ( obj.constructor &&
+				!hasOwn.call(obj, "constructor") &&
+				!hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) {
+				return false;
+			}
+		} catch ( e ) {
+			// IE8,9 Will throw exceptions on certain host objects #9897
+			return false;
+		}
+
+		// Support: IE<9
+		// Handle iteration over inherited properties before own properties.
+		if ( support.ownLast ) {
+			for ( key in obj ) {
+				return hasOwn.call( obj, key );
+			}
+		}
+
+		// Own properties are enumerated firstly, so to speed up,
+		// if last one is own, then all properties are own.
+		for ( key in obj ) {}
+
+		return key === undefined || hasOwn.call( obj, key );
+	},
+
+	type: function( obj ) {
+		if ( obj == null ) {
+			return obj + "";
+		}
+		return typeof obj === "object" || typeof obj === "function" ?
+			class2type[ toString.call(obj) ] || "object" :
+			typeof obj;
+	},
+
+	// Evaluates a script in a global context
+	// Workarounds based on findings by Jim Driscoll
+	// http://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context
+	globalEval: function( data ) {
+		if ( data && jQuery.trim( data ) ) {
+			// We use execScript on Internet Explorer
+			// We use an anonymous function so that context is window
+			// rather than jQuery in Firefox
+			( window.execScript || function( data ) {
+				window[ "eval" ].call( window, data );
+			} )( data );
+		}
+	},
+
+	// Convert dashed to camelCase; used by the css and data modules
+	// Microsoft forgot to hump their vendor prefix (#9572)
+	camelCase: function( string ) {
+		return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase );
+	},
+
+	nodeName: function( elem, name ) {
+		return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();
+	},
+
+	// args is for internal usage only
+	each: function( obj, callback, args ) {
+		var value,
+			i = 0,
+			length = obj.length,
+			isArray = isArraylike( obj );
+
+		if ( args ) {
+			if ( isArray ) {
+				for ( ; i < length; i++ ) {
+					value = callback.apply( obj[ i ], args );
+
+					if ( value === false ) {
+						break;
+					}
+				}
+			} else {
+				for ( i in obj ) {
+					value = callback.apply( obj[ i ], args );
+
+					if ( value === false ) {
+						break;
+					}
+				}
+			}
+
+		// A special, fast, case for the most common use of each
+		} else {
+			if ( isArray ) {
+				for ( ; i < length; i++ ) {
+					value = callback.call( obj[ i ], i, obj[ i ] );
+
+					if ( value === false ) {
+						break;
+					}
+				}
+			} else {
+				for ( i in obj ) {
+					value = callback.call( obj[ i ], i, obj[ i ] );
+
+					if ( value === false ) {
+						break;
+					}
+				}
+			}
+		}
+
+		return obj;
+	},
+
+	// Support: Android<4.1, IE<9
+	trim: function( text ) {
+		return text == null ?
+			"" :
+			( text + "" ).replace( rtrim, "" );
+	},
+
+	// results is for internal usage only
+	makeArray: function( arr, results ) {
+		var ret = results || [];
+
+		if ( arr != null ) {
+			if ( isArraylike( Object(arr) ) ) {
+				jQuery.merge( ret,
+					typeof arr === "string" ?
+					[ arr ] : arr
+				);
+			} else {
+				push.call( ret, arr );
+			}
+		}
+
+		return ret;
+	},
+
+	inArray: function( elem, arr, i ) {
+		var len;
+
+		if ( arr ) {
+			if ( indexOf ) {
+				return indexOf.call( arr, elem, i );
+			}
+
+			len = arr.length;
+			i = i ? i < 0 ? Math.max( 0, len + i ) : i : 0;
+
+			for ( ; i < len; i++ ) {
+				// Skip accessing in sparse arrays
+				if ( i in arr && arr[ i ] === elem ) {
+					return i;
+				}
+			}
+		}
+
+		return -1;
+	},
+
+	merge: function( first, second ) {
+		var len = +second.length,
+			j = 0,
+			i = first.length;
+
+		while ( j < len ) {
+			first[ i++ ] = second[ j++ ];
+		}
+
+		// Support: IE<9
+		// Workaround casting of .length to NaN on otherwise arraylike objects (e.g., NodeLists)
+		if ( len !== len ) {
+			while ( second[j] !== undefined ) {
+				first[ i++ ] = second[ j++ ];
+			}
+		}
+
+		first.length = i;
+
+		return first;
+	},
+
+	grep: function( elems, callback, invert ) {
+		var callbackInverse,
+			matches = [],
+			i = 0,
+			length = elems.length,
+			callbackExpect = !invert;
+
+		// Go through the array, only saving the items
+		// that pass the validator function
+		for ( ; i < length; i++ ) {
+			callbackInverse = !callback( elems[ i ], i );
+			if ( callbackInverse !== callbackExpect ) {
+				matches.push( elems[ i ] );
+			}
+		}
+
+		return matches;
+	},
+
+	// arg is for internal usage only
+	map: function( elems, callback, arg ) {
+		var value,
+			i = 0,
+			length = elems.length,
+			isArray = isArraylike( elems ),
+			ret = [];
+
+		// Go through the array, translating each of the items to their new values
+		if ( isArray ) {
+			for ( ; i < length; i++ ) {
+				value = callback( elems[ i ], i, arg );
+
+				if ( value != null ) {
+					ret.push( value );
+				}
+			}
+
+		// Go through every key on the object,
+		} else {
+			for ( i in elems ) {
+				value = callback( elems[ i ], i, arg );
+
+				if ( value != null ) {
+					ret.push( value );
+				}
+			}
+		}
+
+		// Flatten any nested arrays
+		return concat.apply( [], ret );
+	},
+
+	// A global GUID counter for objects
+	guid: 1,
+
+	// Bind a function to a context, optionally partially applying any
+	// arguments.
+	proxy: function( fn, context ) {
+		var args, proxy, tmp;
+
+		if ( typeof context === "string" ) {
+			tmp = fn[ context ];
+			context = fn;
+			fn = tmp;
+		}
+
+		// Quick check to determine if target is callable, in the spec
+		// this throws a TypeError, but we will just return undefined.
+		if ( !jQuery.isFunction( fn ) ) {
+			return undefined;
+		}
+
+		// Simulated bind
+		args = slice.call( arguments, 2 );
+		proxy = function() {
+			return fn.apply( context || this, args.concat( slice.call( arguments ) ) );
+		};
+
+		// Set the guid of unique handler to the same of original handler, so it can be removed
+		proxy.guid = fn.guid = fn.guid || jQuery.guid++;
+
+		return proxy;
+	},
+
+	now: function() {
+		return +( new Date() );
+	},
+
+	// jQuery.support is not used in Core but other projects attach their
+	// properties to it so it needs to exist.
+	support: support
+});
+
+// Populate the class2type map
+jQuery.each("Boolean Number String Function Array Date RegExp Object Error".split(" "), function(i, name) {
+	class2type[ "[object " + name + "]" ] = name.toLowerCase();
+});
+
+function isArraylike( obj ) {
+	var length = obj.length,
+		type = jQuery.type( obj );
+
+	if ( type === "function" || jQuery.isWindow( obj ) ) {
+		return false;
+	}
+
+	if ( obj.nodeType === 1 && length ) {
+		return true;
+	}
+
+	return type === "array" || length === 0 ||
+		typeof length === "number" && length > 0 && ( length - 1 ) in obj;
+}
+var Sizzle =
+/*!
+ * Sizzle CSS Selector Engine v1.10.19
+ * http://sizzlejs.com/
+ *
+ * Copyright 2013 jQuery Foundation, Inc. and other contributors
+ * Released under the MIT license
+ * http://jquery.org/license
+ *
+ * Date: 2014-04-18
+ */
+(function( window ) {
+
+var i,
+	support,
+	Expr,
+	getText,
+	isXML,
+	tokenize,
+	compile,
+	select,
+	outermostContext,
+	sortInput,
+	hasDuplicate,
+
+	// Local document vars
+	setDocument,
+	document,
+	docElem,
+	documentIsHTML,
+	rbuggyQSA,
+	rbuggyMatches,
+	matches,
+	contains,
+
+	// Instance-specific data
+	expando = "sizzle" + -(new Date()),
+	preferredDoc = window.document,
+	dirruns = 0,
+	done = 0,
+	classCache = createCache(),
+	tokenCache = createCache(),
+	compilerCache = createCache(),
+	sortOrder = function( a, b ) {
+		if ( a === b ) {
+			hasDuplicate = true;
+		}
+		return 0;
+	},
+
+	// General-purpose constants
+	strundefined = typeof undefined,
+	MAX_NEGATIVE = 1 << 31,
+
+	// Instance methods
+	hasOwn = ({}).hasOwnProperty,
+	arr = [],
+	pop = arr.pop,
+	push_native = arr.push,
+	push = arr.push,
+	slice = arr.slice,
+	// Use a stripped-down indexOf if we can't use a native one
+	indexOf = arr.indexOf || function( elem ) {
+		var i = 0,
+			len = this.length;
+		for ( ; i < len; i++ ) {
+			if ( this[i] === elem ) {
+				return i;
+			}
+		}
+		return -1;
+	},
+
+	booleans = "checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",
+
+	// Regular expressions
+
+	// Whitespace characters http://www.w3.org/TR/css3-selectors/#whitespace
+	whitespace = "[\\x20\\t\\r\\n\\f]",
+	// http://www.w3.org/TR/css3-syntax/#characters
+	characterEncoding = "(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",
+
+	// Loosely modeled on CSS identifier characters
+	// An unquoted value should be a CSS identifier http://www.w3.org/TR/css3-selectors/#attribute-selectors
+	// Proper syntax: http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier
+	identifier = characterEncoding.replace( "w", "w#" ),
+
+	// Attribute selectors: http://www.w3.org/TR/selectors/#attribute-selectors
+	attributes = "\\[" + whitespace + "*(" + characterEncoding + ")(?:" + whitespace +
+		// Operator (capture 2)
+		"*([*^$|!~]?=)" + whitespace +
+		// "Attribute values must be CSS identifiers [capture 5] or strings [capture 3 or capture 4]"
+		"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|(" + identifier + "))|)" + whitespace +
+		"*\\]",
+
+	pseudos = ":(" + characterEncoding + ")(?:\\((" +
+		// To reduce the number of selectors needing tokenize in the preFilter, prefer arguments:
+		// 1. quoted (capture 3; capture 4 or capture 5)
+		"('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|" +
+		// 2. simple (capture 6)
+		"((?:\\\\.|[^\\\\()[\\]]|" + attributes + ")*)|" +
+		// 3. anything else (capture 2)
+		".*" +
+		")\\)|)",
+
+	// Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter
+	rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$", "g" ),
+
+	rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ),
+	rcombinators = new RegExp( "^" + whitespace + "*([>+~]|" + whitespace + ")" + whitespace + "*" ),
+
+	rattributeQuotes = new RegExp( "=" + whitespace + "*([^\\]'\"]*?)" + whitespace + "*\\]", "g" ),
+
+	rpseudo = new RegExp( pseudos ),
+	ridentifier = new RegExp( "^" + identifier + "$" ),
+
+	matchExpr = {
+		"ID": new RegExp( "^#(" + characterEncoding + ")" ),
+		"CLASS": new RegExp( "^\\.(" + characterEncoding + ")" ),
+		"TAG": new RegExp( "^(" + characterEncoding.replace( "w", "w*" ) + ")" ),
+		"ATTR": new RegExp( "^" + attributes ),
+		"PSEUDO": new RegExp( "^" + pseudos ),
+		"CHILD": new RegExp( "^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" + whitespace +
+			"*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" + whitespace +
+			"*(\\d+)|))" + whitespace + "*\\)|)", "i" ),
+		"bool": new RegExp( "^(?:" + booleans + ")$", "i" ),
+		// For use in libraries implementing .is()
+		// We use this for POS matching in `select`
+		"needsContext": new RegExp( "^" + whitespace + "*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" +
+			whitespace + "*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i" )
+	},
+
+	rinputs = /^(?:input|select|textarea|button)$/i,
+	rheader = /^h\d$/i,
+
+	rnative = /^[^{]+\{\s*\[native \w/,
+
+	// Easily-parseable/retrievable ID or TAG or CLASS selectors
+	rquickExpr = /^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,
+
+	rsibling = /[+~]/,
+	rescape = /'|\\/g,
+
+	// CSS escapes http://www.w3.org/TR/CSS21/syndata.html#escaped-characters
+	runescape = new RegExp( "\\\\([\\da-f]{1,6}" + whitespace + "?|(" + whitespace + ")|.)", "ig" ),
+	funescape = function( _, escaped, escapedWhitespace ) {
+		var high = "0x" + escaped - 0x10000;
+		// NaN means non-codepoint
+		// Support: Firefox<24
+		// Workaround erroneous numeric interpretation of +"0x"
+		return high !== high || escapedWhitespace ?
+			escaped :
+			high < 0 ?
+				// BMP codepoint
+				String.fromCharCode( high + 0x10000 ) :
+				// Supplemental Plane codepoint (surrogate pair)
+				String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 );
+	};
+
+// Optimize for push.apply( _, NodeList )
+try {
+	push.apply(
+		(arr = slice.call( preferredDoc.childNodes )),
+		preferredDoc.childNodes
+	);
+	// Support: Android<4.0
+	// Detect silently failing push.apply
+	arr[ preferredDoc.childNodes.length ].nodeType;
+} catch ( e ) {
+	push = { apply: arr.length ?
+
+		// Leverage slice if possible
+		function( target, els ) {
+			push_native.apply( target, slice.call(els) );
+		} :
+
+		// Support: IE<9
+		// Otherwise append directly
+		function( target, els ) {
+			var j = target.length,
+				i = 0;
+			// Can't trust NodeList.length
+			while ( (target[j++] = els[i++]) ) {}
+			target.length = j - 1;
+		}
+	};
+}
+
+function Sizzle( selector, context, results, seed ) {
+	var match, elem, m, nodeType,
+		// QSA vars
+		i, groups, old, nid, newContext, newSelector;
+
+	if ( ( context ? context.ownerDocument || context : preferredDoc ) !== document ) {
+		setDocument( context );
+	}
+
+	context = context || document;
+	results = results || [];
+
+	if ( !selector || typeof selector !== "string" ) {
+		return results;
+	}
+
+	if ( (nodeType = context.nodeType) !== 1 && nodeType !== 9 ) {
+		return [];
+	}
+
+	if ( documentIsHTML && !seed ) {
+
+		// Shortcuts
+		if ( (match = rquickExpr.exec( selector )) ) {
+			// Speed-up: Sizzle("#ID")
+			if ( (m = match[1]) ) {
+				if ( nodeType === 9 ) {
+					elem = context.getElementById( m );
+					// Check parentNode to catch when Blackberry 4.6 returns
+					// nodes that are no longer in the document (jQuery #6963)
+					if ( elem && elem.parentNode ) {
+						// Handle the case where IE, Opera, and Webkit return items
+						// by name instead of ID
+						if ( elem.id === m ) {
+							results.push( elem );
+							return results;
+						}
+					} else {
+						return results;
+					}
+				} else {
+					// Context is not a document
+					if ( context.ownerDocument && (elem = context.ownerDocument.getElementById( m )) &&
+						contains( context, elem ) && elem.id === m ) {
+						results.push( elem );
+						return results;
+					}
+				}
+
+			// Speed-up: Sizzle("TAG")
+			} else if ( match[2] ) {
+				push.apply( results, context.getElementsByTagName( selector ) );
+				return results;
+
+			// Speed-up: Sizzle(".CLASS")
+			} else if ( (m = match[3]) && support.getElementsByClassName && context.getElementsByClassName ) {
+				push.apply( results, context.getElementsByClassName( m ) );
+				return results;
+			}
+		}
+
+		// QSA path
+		if ( support.qsa && (!rbuggyQSA || !rbuggyQSA.test( selector )) ) {
+			nid = old = expando;
+			newContext = context;
+			newSelector = nodeType === 9 && selector;
+
+			// qSA works strangely on Element-rooted queries
+			// We can work around this by specifying an extra ID on the root
+			// and working up from there (Thanks to Andrew Dupont for the technique)
+			// IE 8 doesn't work on object elements
+			if ( nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) {
+				groups = tokenize( selector );
+
+				if ( (old = context.getAttribute("id")) ) {
+					nid = old.replace( rescape, "\\$&" );
+				} else {
+					context.setAttribute( "id", nid );
+				}
+				nid = "[id='" + nid + "'] ";
+
+				i = groups.length;
+				while ( i-- ) {
+					groups[i] = nid + toSelector( groups[i] );
+				}
+				newContext = rsibling.test( selector ) && testContext( context.parentNode ) || context;
+				newSelector = groups.join(",");
+			}
+
+			if ( newSelector ) {
+				try {
+					push.apply( results,
+						newContext.querySelectorAll( newSelector )
+					);
+					return results;
+				} catch(qsaError) {
+				} finally {
+					if ( !old ) {
+						context.removeAttribute("id");
+					}
+				}
+			}
+		}
+	}
+
+	// All others
+	return select( selector.replace( rtrim, "$1" ), context, results, seed );
+}
+
+/**
+ * Create key-value caches of limited size
+ * @returns {Function(string, Object)} Returns the Object data after storing it on itself with
+ *	property name the (space-suffixed) string and (if the cache is larger than Expr.cacheLength)
+ *	deleting the oldest entry
+ */
+function createCache() {
+	var keys = [];
+
+	function cache( key, value ) {
+		// Use (key + " ") to avoid collision with native prototype properties (see Issue #157)
+		if ( keys.push( key + " " ) > Expr.cacheLength ) {
+			// Only keep the most recent entries
+			delete cache[ keys.shift() ];
+		}
+		return (cache[ key + " " ] = value);
+	}
+	return cache;
+}
+
+/**
+ * Mark a function for special use by Sizzle
+ * @param {Function} fn The function to mark
+ */
+function markFunction( fn ) {
+	fn[ expando ] = true;
+	return fn;
+}
+
+/**
+ * Support testing using an element
+ * @param {Function} fn Passed the created div and expects a boolean result
+ */
+function assert( fn ) {
+	var div = document.createElement("div");
+
+	try {
+		return !!fn( div );
+	} catch (e) {
+		return false;
+	} finally {
+		// Remove from its parent by default
+		if ( div.parentNode ) {
+			div.parentNode.removeChild( div );
+		}
+		// release memory in IE
+		div = null;
+	}
+}
+
+/**
+ * Adds the same handler for all of the specified attrs
+ * @param {String} attrs Pipe-separated list of attributes
+ * @param {Function} handler The method that will be applied
+ */
+function addHandle( attrs, handler ) {
+	var arr = attrs.split("|"),
+		i = attrs.length;
+
+	while ( i-- ) {
+		Expr.attrHandle[ arr[i] ] = handler;
+	}
+}
+
+/**
+ * Checks document order of two siblings
+ * @param {Element} a
+ * @param {Element} b
+ * @returns {Number} Returns less than 0 if a precedes b, greater than 0 if a follows b
+ */
+function siblingCheck( a, b ) {
+	var cur = b && a,
+		diff = cur && a.nodeType === 1 && b.nodeType === 1 &&
+			( ~b.sourceIndex || MAX_NEGATIVE ) -
+			( ~a.sourceIndex || MAX_NEGATIVE );
+
+	// Use IE sourceIndex if available on both nodes
+	if ( diff ) {
+		return diff;
+	}
+
+	// Check if b follows a
+	if ( cur ) {
+		while ( (cur = cur.nextSibling) ) {
+			if ( cur === b ) {
+				return -1;
+			}
+		}
+	}
+
+	return a ? 1 : -1;
+}
+
+/**
+ * Returns a function to use in pseudos for input types
+ * @param {String} type
+ */
+function createInputPseudo( type ) {
+	return function( elem ) {
+		var name = elem.nodeName.toLowerCase();
+		return name === "input" && elem.type === type;
+	};
+}
+
+/**
+ * Returns a function to use in pseudos for buttons
+ * @param {String} type
+ */
+function createButtonPseudo( type ) {
+	return function( elem ) {
+		var name = elem.nodeName.toLowerCase();
+		return (name === "input" || name === "button") && elem.type === type;
+	};
+}
+
+/**
+ * Returns a function to use in pseudos for positionals
+ * @param {Function} fn
+ */
+function createPositionalPseudo( fn ) {
+	return markFunction(function( argument ) {
+		argument = +argument;
+		return markFunction(function( seed, matches ) {
+			var j,
+				matchIndexes = fn( [], seed.length, argument ),
+				i = matchIndexes.length;
+
+			// Match elements found at the specified indexes
+			while ( i-- ) {
+				if ( seed[ (j = matchIndexes[i]) ] ) {
+					seed[j] = !(matches[j] = seed[j]);
+				}
+			}
+		});
+	});
+}
+
+/**
+ * Checks a node for validity as a Sizzle context
+ * @param {Element|Object=} context
+ * @returns {Element|Object|Boolean} The input node if acceptable, otherwise a falsy value
+ */
+function testContext( context ) {
+	return context && typeof context.getElementsByTagName !== strundefined && context;
+}
+
+// Expose support vars for convenience
+support = Sizzle.support = {};
+
+/**
+ * Detects XML nodes
+ * @param {Element|Object} elem An element or a document
+ * @returns {Boolean} True iff elem is a non-HTML XML node
+ */
+isXML = Sizzle.isXML = function( elem ) {
+	// documentElement is verified for cases where it doesn't yet exist
+	// (such as loading iframes in IE - #4833)
+	var documentElement = elem && (elem.ownerDocument || elem).documentElement;
+	return documentElement ? documentElement.nodeName !== "HTML" : false;
+};
+
+/**
+ * Sets document-related variables once based on the current document
+ * @param {Element|Object} [doc] An element or document object to use to set the document
+ * @returns {Object} Returns the current document
+ */
+setDocument = Sizzle.setDocument = function( node ) {
+	var hasCompare,
+		doc = node ? node.ownerDocument || node : preferredDoc,
+		parent = doc.defaultView;
+
+	// If no document and documentElement is available, return
+	if ( doc === document || doc.nodeType !== 9 || !doc.documentElement ) {
+		return document;
+	}
+
+	// Set our document
+	document = doc;
+	docElem = doc.documentElement;
+
+	// Support tests
+	documentIsHTML = !isXML( doc );
+
+	// Support: IE>8
+	// If iframe document is assigned to "document" variable and if iframe has been reloaded,
+	// IE will throw "permission denied" error when accessing "document" variable, see jQuery #13936
+	// IE6-8 do not support the defaultView property so parent will be undefined
+	if ( parent && parent !== parent.top ) {
+		// IE11 does not have attachEvent, so all must suffer
+		if ( parent.addEventListener ) {
+			parent.addEventListener( "unload", function() {
+				setDocument();
+			}, false );
+		} else if ( parent.attachEvent ) {
+			parent.attachEvent( "onunload", function() {
+				setDocument();
+			});
+		}
+	}
+
+	/* Attributes
+	---------------------------------------------------------------------- */
+
+	// Support: IE<8
+	// Verify that getAttribute really returns attributes and not properties (excepting IE8 booleans)
+	support.attributes = assert(function( div ) {
+		div.className = "i";
+		return !div.getAttribute("className");
+	});
+
+	/* getElement(s)By*
+	---------------------------------------------------------------------- */
+
+	// Check if getElementsByTagName("*") returns only elements
+	support.getElementsByTagName = assert(function( div ) {
+		div.appendChild( doc.createComment("") );
+		return !div.getElementsByTagName("*").length;
+	});
+
+	// Check if getElementsByClassName can be trusted
+	support.getElementsByClassName = rnative.test( doc.getElementsByClassName ) && assert(function( div ) {
+		div.innerHTML = "<div class='a'></div><div class='a i'></div>";
+
+		// Support: Safari<4
+		// Catch class over-caching
+		div.firstChild.className = "i";
+		// Support: Opera<10
+		// Catch gEBCN failure to find non-leading classes
+		return div.getElementsByClassName("i").length === 2;
+	});
+
+	// Support: IE<10
+	// Check if getElementById returns elements by name
+	// The broken getElementById methods don't pick up programatically-set names,
+	// so use a roundabout getElementsByName test
+	support.getById = assert(function( div ) {
+		docElem.appendChild( div ).id = expando;
+		return !doc.getElementsByName || !doc.getElementsByName( expando ).length;
+	});
+
+	// ID find and filter
+	if ( support.getById ) {
+		Expr.find["ID"] = function( id, context ) {
+			if ( typeof context.getElementById !== strundefined && documentIsHTML ) {
+				var m = context.getElementById( id );
+				// Check parentNode to catch when Blackberry 4.6 returns
+				// nodes that are no longer in the document #6963
+				return m && m.parentNode ? [ m ] : [];
+			}
+		};
+		Expr.filter["ID"] = function( id ) {
+			var attrId = id.replace( runescape, funescape );
+			return function( elem ) {
+				return elem.getAttribute("id") === attrId;
+			};
+		};
+	} else {
+		// Support: IE6/7
+		// getElementById is not reliable as a find shortcut
+		delete Expr.find["ID"];
+
+		Expr.filter["ID"] =  function( id ) {
+			var attrId = id.replace( runescape, funescape );
+			return function( elem ) {
+				var node = typeof elem.getAttributeNode !== strundefined && elem.getAttributeNode("id");
+				return node && node.value === attrId;
+			};
+		};
+	}
+
+	// Tag
+	Expr.find["TAG"] = support.getElementsByTagName ?
+		function( tag, context ) {
+			if ( typeof context.getElementsByTagName !== strundefined ) {
+				return context.getElementsByTagName( tag );
+			}
+		} :
+		function( tag, context ) {
+			var elem,
+				tmp = [],
+				i = 0,
+				results = context.getElementsByTagName( tag );
+
+			// Filter out possible comments
+			if ( tag === "*" ) {
+				while ( (elem = results[i++]) ) {
+					if ( elem.nodeType === 1 ) {
+						tmp.push( elem );
+					}
+				}
+
+				return tmp;
+			}
+			return results;
+		};
+
+	// Class
+	Expr.find["CLASS"] = support.getElementsByClassName && function( className, context ) {
+		if ( typeof context.getElementsByClassName !== strundefined && documentIsHTML ) {
+			return context.getElementsByClassName( className );
+		}
+	};
+
+	/* QSA/matchesSelector
+	---------------------------------------------------------------------- */
+
+	// QSA and matchesSelector support
+
+	// matchesSelector(:active) reports false when true (IE9/Opera 11.5)
+	rbuggyMatches = [];
+
+	// qSa(:focus) reports false when true (Chrome 21)
+	// We allow this because of a bug in IE8/9 that throws an error
+	// whenever `document.activeElement` is accessed on an iframe
+	// So, we allow :focus to pass through QSA all the time to avoid the IE error
+	// See http://bugs.jquery.com/ticket/13378
+	rbuggyQSA = [];
+
+	if ( (support.qsa = rnative.test( doc.querySelectorAll )) ) {
+		// Build QSA regex
+		// Regex strategy adopted from Diego Perini
+		assert(function( div ) {
+			// Select is set to empty string on purpose
+			// This is to test IE's treatment of not explicitly
+			// setting a boolean content attribute,
+			// since its presence should be enough
+			// http://bugs.jquery.com/ticket/12359
+			div.innerHTML = "<select msallowclip=''><option selected=''></option></select>";
+
+			// Support: IE8, Opera 11-12.16
+			// Nothing should be selected when empty strings follow ^= or $= or *=
+			// The test attribute must be unknown in Opera but "safe" for WinRT
+			// http://msdn.microsoft.com/en-us/library/ie/hh465388.aspx#attribute_section
+			if ( div.querySelectorAll("[msallowclip^='']").length ) {
+				rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:''|\"\")" );
+			}
+
+			// Support: IE8
+			// Boolean attributes and "value" are not treated correctly
+			if ( !div.querySelectorAll("[selected]").length ) {
+				rbuggyQSA.push( "\\[" + whitespace + "*(?:value|" + booleans + ")" );
+			}
+
+			// Webkit/Opera - :checked should return selected option elements
+			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
+			// IE8 throws error here and will not see later tests
+			if ( !div.querySelectorAll(":checked").length ) {
+				rbuggyQSA.push(":checked");
+			}
+		});
+
+		assert(function( div ) {
+			// Support: Windows 8 Native Apps
+			// The type and name attributes are restricted during .innerHTML assignment
+			var input = doc.createElement("input");
+			input.setAttribute( "type", "hidden" );
+			div.appendChild( input ).setAttribute( "name", "D" );
+
+			// Support: IE8
+			// Enforce case-sensitivity of name attribute
+			if ( div.querySelectorAll("[name=d]").length ) {
+				rbuggyQSA.push( "name" + whitespace + "*[*^$|!~]?=" );
+			}
+
+			// FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled)
+			// IE8 throws error here and will not see later tests
+			if ( !div.querySelectorAll(":enabled").length ) {
+				rbuggyQSA.push( ":enabled", ":disabled" );
+			}
+
+			// Opera 10-11 does not throw on post-comma invalid pseudos
+			div.querySelectorAll("*,:x");
+			rbuggyQSA.push(",.*:");
+		});
+	}
+
+	if ( (support.matchesSelector = rnative.test( (matches = docElem.matches ||
+		docElem.webkitMatchesSelector ||
+		docElem.mozMatchesSelector ||
+		docElem.oMatchesSelector ||
+		docElem.msMatchesSelector) )) ) {
+
+		assert(function( div ) {
+			// Check to see if it's possible to do matchesSelector
+			// on a disconnected node (IE 9)
+			support.disconnectedMatch = matches.call( div, "div" );
+
+			// This should fail with an exception
+			// Gecko does not error, returns false instead
+			matches.call( div, "[s!='']:x" );
+			rbuggyMatches.push( "!=", pseudos );
+		});
+	}
+
+	rbuggyQSA = rbuggyQSA.length && new RegExp( rbuggyQSA.join("|") );
+	rbuggyMatches = rbuggyMatches.length && new RegExp( rbuggyMatches.join("|") );
+
+	/* Contains
+	---------------------------------------------------------------------- */
+	hasCompare = rnative.test( docElem.compareDocumentPosition );
+
+	// Element contains another
+	// Purposefully does not implement inclusive descendent
+	// As in, an element does not contain itself
+	contains = hasCompare || rnative.test( docElem.contains ) ?
+		function( a, b ) {
+			var adown = a.nodeType === 9 ? a.documentElement : a,
+				bup = b && b.parentNode;
+			return a === bup || !!( bup && bup.nodeType === 1 && (
+				adown.contains ?
+					adown.contains( bup ) :
+					a.compareDocumentPosition && a.compareDocumentPosition( bup ) & 16
+			));
+		} :
+		function( a, b ) {
+			if ( b ) {
+				while ( (b = b.parentNode) ) {
+					if ( b === a ) {
+						return true;
+					}
+				}
+			}
+			return false;
+		};
+
+	/* Sorting
+	---------------------------------------------------------------------- */
+
+	// Document order sorting
+	sortOrder = hasCompare ?
+	function( a, b ) {
+
+		// Flag for duplicate removal
+		if ( a === b ) {
+			hasDuplicate = true;
+			return 0;
+		}
+
+		// Sort on method existence if only one input has compareDocumentPosition
+		var compare = !a.compareDocumentPosition - !b.compareDocumentPosition;
+		if ( compare ) {
+			return compare;
+		}
+
+		// Calculate position if both inputs belong to the same document
+		compare = ( a.ownerDocument || a ) === ( b.ownerDocument || b ) ?
+			a.compareDocumentPosition( b ) :
+
+			// Otherwise we know they are disconnected
+			1;
+
+		// Disconnected nodes
+		if ( compare & 1 ||
+			(!support.sortDetached && b.compareDocumentPosition( a ) === compare) ) {
+
+			// Choose the first element that is related to our preferred document
+			if ( a === doc || a.ownerDocument === preferredDoc && contains(preferredDoc, a) ) {
+				return -1;
+			}
+			if ( b === doc || b.ownerDocument === preferredDoc && contains(preferredDoc, b) ) {
+				return 1;
+			}
+
+			// Maintain original order
+			return sortInput ?
+				( indexOf.call( sortInput, a ) - indexOf.call( sortInput, b ) ) :
+				0;
+		}
+
+		return compare & 4 ? -1 : 1;
+	} :
+	function( a, b ) {
+		// Exit early if the nodes are identical
+		if ( a === b ) {
+			hasDuplicate = true;
+			return 0;
+		}
+
+		var cur,
+			i = 0,
+			aup = a.parentNode,
+			bup = b.parentNode,
+			ap = [ a ],
+			bp = [ b ];
+
+		// Parentless nodes are either documents or disconnected
+		if ( !aup || !bup ) {
+			return a === doc ? -1 :
+				b === doc ? 1 :
+				aup ? -1 :
+				bup ? 1 :
+				sortInput ?
+				( indexOf.call( sortInput, a ) - indexOf.call( sortInput, b ) ) :
+				0;
+
+		// If the nodes are siblings, we can do a quick check
+		} else if ( aup === bup ) {
+			return siblingCheck( a, b );
+		}
+
+		// Otherwise we need full lists of their ancestors for comparison
+		cur = a;
+		while ( (cur = cur.parentNode) ) {
+			ap.unshift( cur );
+		}
+		cur = b;
+		while ( (cur = cur.parentNode) ) {
+			bp.unshift( cur );
+		}
+
+		// Walk down the tree looking for a discrepancy
+		while ( ap[i] === bp[i] ) {
+			i++;
+		}
+
+		return i ?
+			// Do a sibling check if the nodes have a common ancestor
+			siblingCheck( ap[i], bp[i] ) :
+
+			// Otherwise nodes in our document sort first
+			ap[i] === preferredDoc ? -1 :
+			bp[i] === preferredDoc ? 1 :
+			0;
+	};
+
+	return doc;
+};
+
+Sizzle.matches = function( expr, elements ) {
+	return Sizzle( expr, null, null, elements );
+};
+
+Sizzle.matchesSelector = function( elem, expr ) {
+	// Set document vars if needed
+	if ( ( elem.ownerDocument || elem ) !== document ) {
+		setDocument( elem );
+	}
+
+	// Make sure that attribute selectors are quoted
+	expr = expr.replace( rattributeQuotes, "='$1']" );
+
+	if ( support.matchesSelector && documentIsHTML &&
+		( !rbuggyMatches || !rbuggyMatches.test( expr ) ) &&
+		( !rbuggyQSA     || !rbuggyQSA.test( expr ) ) ) {
+
+		try {
+			var ret = matches.call( elem, expr );
+
+			// IE 9's matchesSelector returns false on disconnected nodes
+			if ( ret || support.disconnectedMatch ||
+					// As well, disconnected nodes are said to be in a document
+					// fragment in IE 9
+					elem.document && elem.document.nodeType !== 11 ) {
+				return ret;
+			}
+		} catch(e) {}
+	}
+
+	return Sizzle( expr, document, null, [ elem ] ).length > 0;
+};
+
+Sizzle.contains = function( context, elem ) {
+	// Set document vars if needed
+	if ( ( context.ownerDocument || context ) !== document ) {
+		setDocument( context );
+	}
+	return contains( context, elem );
+};
+
+Sizzle.attr = function( elem, name ) {
+	// Set document vars if needed
+	if ( ( elem.ownerDocument || elem ) !== document ) {
+		setDocument( elem );
+	}
+
+	var fn = Expr.attrHandle[ name.toLowerCase() ],
+		// Don't get fooled by Object.prototype properties (jQuery #13807)
+		val = fn && hasOwn.call( Expr.attrHandle, name.toLowerCase() ) ?
+			fn( elem, name, !documentIsHTML ) :
+			undefined;
+
+	return val !== undefined ?
+		val :
+		support.attributes || !documentIsHTML ?
+			elem.getAttribute( name ) :
+			(val = elem.getAttributeNode(name)) && val.specified ?
+				val.value :
+				null;
+};
+
+Sizzle.error = function( msg ) {
+	throw new Error( "Syntax error, unrecognized expression: " + msg );
+};
+
+/**
+ * Document sorting and removing duplicates
+ * @param {ArrayLike} results
+ */
+Sizzle.uniqueSort = function( results ) {
+	var elem,
+		duplicates = [],
+		j = 0,
+		i = 0;
+
+	// Unless we *know* we can detect duplicates, assume their presence
+	hasDuplicate = !support.detectDuplicates;
+	sortInput = !support.sortStable && results.slice( 0 );
+	results.sort( sortOrder );
+
+	if ( hasDuplicate ) {
+		while ( (elem = results[i++]) ) {
+			if ( elem === results[ i ] ) {
+				j = duplicates.push( i );
+			}
+		}
+		while ( j-- ) {
+			results.splice( duplicates[ j ], 1 );
+		}
+	}
+
+	// Clear input after sorting to release objects
+	// See https://github.com/jquery/sizzle/pull/225
+	sortInput = null;
+
+	return results;
+};
+
+/**
+ * Utility function for retrieving the text value of an array of DOM nodes
+ * @param {Array|Element} elem
+ */
+getText = Sizzle.getText = function( elem ) {
+	var node,
+		ret = "",
+		i = 0,
+		nodeType = elem.nodeType;
+
+	if ( !nodeType ) {
+		// If no nodeType, this is expected to be an array
+		while ( (node = elem[i++]) ) {
+			// Do not traverse comment nodes
+			ret += getText( node );
+		}
+	} else if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) {
+		// Use textContent for elements
+		// innerText usage removed for consistency of new lines (jQuery #11153)
+		if ( typeof elem.textContent === "string" ) {
+			return elem.textContent;
+		} else {
+			// Traverse its children
+			for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
+				ret += getText( elem );
+			}
+		}
+	} else if ( nodeType === 3 || nodeType === 4 ) {
+		return elem.nodeValue;
+	}
+	// Do not include comment or processing instruction nodes
+
+	return ret;
+};
+
+Expr = Sizzle.selectors = {
+
+	// Can be adjusted by the user
+	cacheLength: 50,
+
+	createPseudo: markFunction,
+
+	match: matchExpr,
+
+	attrHandle: {},
+
+	find: {},
+
+	relative: {
+		">": { dir: "parentNode", first: true },
+		" ": { dir: "parentNode" },
+		"+": { dir: "previousSibling", first: true },
+		"~": { dir: "previousSibling" }
+	},
+
+	preFilter: {
+		"ATTR": function( match ) {
+			match[1] = match[1].replace( runescape, funescape );
+
+			// Move the given value to match[3] whether quoted or unquoted
+			match[3] = ( match[3] || match[4] || match[5] || "" ).replace( runescape, funescape );
+
+			if ( match[2] === "~=" ) {
+				match[3] = " " + match[3] + " ";
+			}
+
+			return match.slice( 0, 4 );
+		},
+
+		"CHILD": function( match ) {
+			/* matches from matchExpr["CHILD"]
+				1 type (only|nth|...)
+				2 what (child|of-type)
+				3 argument (even|odd|\d*|\d*n([+-]\d+)?|...)
+				4 xn-component of xn+y argument ([+-]?\d*n|)
+				5 sign of xn-component
+				6 x of xn-component
+				7 sign of y-component
+				8 y of y-component
+			*/
+			match[1] = match[1].toLowerCase();
+
+			if ( match[1].slice( 0, 3 ) === "nth" ) {
+				// nth-* requires argument
+				if ( !match[3] ) {
+					Sizzle.error( match[0] );
+				}
+
+				// numeric x and y parameters for Expr.filter.CHILD
+				// remember that false/true cast respectively to 0/1
+				match[4] = +( match[4] ? match[5] + (match[6] || 1) : 2 * ( match[3] === "even" || match[3] === "odd" ) );
+				match[5] = +( ( match[7] + match[8] ) || match[3] === "odd" );
+
+			// other types prohibit arguments
+			} else if ( match[3] ) {
+				Sizzle.error( match[0] );
+			}
+
+			return match;
+		},
+
+		"PSEUDO": function( match ) {
+			var excess,
+				unquoted = !match[6] && match[2];
+
+			if ( matchExpr["CHILD"].test( match[0] ) ) {
+				return null;
+			}
+
+			// Accept quoted arguments as-is
+			if ( match[3] ) {
+				match[2] = match[4] || match[5] || "";
+
+			// Strip excess characters from unquoted arguments
+			} else if ( unquoted && rpseudo.test( unquoted ) &&
+				// Get excess from tokenize (recursively)
+				(excess = tokenize( unquoted, true )) &&
+				// advance to the next closing parenthesis
+				(excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length) ) {
+
+				// excess is a negative index
+				match[0] = match[0].slice( 0, excess );
+				match[2] = unquoted.slice( 0, excess );
+			}
+
+			// Return only captures needed by the pseudo filter method (type and argument)
+			return match.slice( 0, 3 );
+		}
+	},
+
+	filter: {
+
+		"TAG": function( nodeNameSelector ) {
+			var nodeName = nodeNameSelector.replace( runescape, funescape ).toLowerCase();
+			return nodeNameSelector === "*" ?
+				function() { return true; } :
+				function( elem ) {
+					return elem.nodeName && elem.nodeName.toLowerCase() === nodeName;
+				};
+		},
+
+		"CLASS": function( className ) {
+			var pattern = classCache[ className + " " ];
+
+			return pattern ||
+				(pattern = new RegExp( "(^|" + whitespace + ")" + className + "(" + whitespace + "|$)" )) &&
+				classCache( className, function( elem ) {
+					return pattern.test( typeof elem.className === "string" && elem.className || typeof elem.getAttribute !== strundefined && elem.getAttribute("class") || "" );
+				});
+		},
+
+		"ATTR": function( name, operator, check ) {
+			return function( elem ) {
+				var result = Sizzle.attr( elem, name );
+
+				if ( result == null ) {
+					return operator === "!=";
+				}
+				if ( !operator ) {
+					return true;
+				}
+
+				result += "";
+
+				return operator === "=" ? result === check :
+					operator === "!=" ? result !== check :
+					operator === "^=" ? check && result.indexOf( check ) === 0 :
+					operator === "*=" ? check && result.indexOf( check ) > -1 :
+					operator === "$=" ? check && result.slice( -check.length ) === check :
+					operator === "~=" ? ( " " + result + " " ).indexOf( check ) > -1 :
+					operator === "|=" ? result === check || result.slice( 0, check.length + 1 ) === check + "-" :
+					false;
+			};
+		},
+
+		"CHILD": function( type, what, argument, first, last ) {
+			var simple = type.slice( 0, 3 ) !== "nth",
+				forward = type.slice( -4 ) !== "last",
+				ofType = what === "of-type";
+
+			return first === 1 && last === 0 ?
+
+				// Shortcut for :nth-*(n)
+				function( elem ) {
+					return !!elem.parentNode;
+				} :
+
+				function( elem, context, xml ) {
+					var cache, outerCache, node, diff, nodeIndex, start,
+						dir = simple !== forward ? "nextSibling" : "previousSibling",
+						parent = elem.parentNode,
+						name = ofType && elem.nodeName.toLowerCase(),
+						useCache = !xml && !ofType;
+
+					if ( parent ) {
+
+						// :(first|last|only)-(child|of-type)
+						if ( simple ) {
+							while ( dir ) {
+								node = elem;
+								while ( (node = node[ dir ]) ) {
+									if ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) {
+										return false;
+									}
+								}
+								// Reverse direction for :only-* (if we haven't yet done so)
+								start = dir = type === "only" && !start && "nextSibling";
+							}
+							return true;
+						}
+
+						start = [ forward ? parent.firstChild : parent.lastChild ];
+
+						// non-xml :nth-child(...) stores cache data on `parent`
+						if ( forward && useCache ) {
+							// Seek `elem` from a previously-cached index
+							outerCache = parent[ expando ] || (parent[ expando ] = {});
+							cache = outerCache[ type ] || [];
+							nodeIndex = cache[0] === dirruns && cache[1];
+							diff = cache[0] === dirruns && cache[2];
+							node = nodeIndex && parent.childNodes[ nodeIndex ];
+
+							while ( (node = ++nodeIndex && node && node[ dir ] ||
+
+								// Fallback to seeking `elem` from the start
+								(diff = nodeIndex = 0) || start.pop()) ) {
+
+								// When found, cache indexes on `parent` and break
+								if ( node.nodeType === 1 && ++diff && node === elem ) {
+									outerCache[ type ] = [ dirruns, nodeIndex, diff ];
+									break;
+								}
+							}
+
+						// Use previously-cached element index if available
+						} else if ( useCache && (cache = (elem[ expando ] || (elem[ expando ] = {}))[ type ]) && cache[0] === dirruns ) {
+							diff = cache[1];
+
+						// xml :nth-child(...) or :nth-last-child(...) or :nth(-last)?-of-type(...)
+						} else {
+							// Use the same loop as above to seek `elem` from the start
+							while ( (node = ++nodeIndex && node && node[ dir ] ||
+								(diff = nodeIndex = 0) || start.pop()) ) {
+
+								if ( ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) && ++diff ) {
+									// Cache the index of each encountered element
+									if ( useCache ) {
+										(node[ expando ] || (node[ expando ] = {}))[ type ] = [ dirruns, diff ];
+									}
+
+									if ( node === elem ) {
+										break;
+									}
+								}
+							}
+						}
+
+						// Incorporate the offset, then check against cycle size
+						diff -= last;
+						return diff === first || ( diff % first === 0 && diff / first >= 0 );
+					}
+				};
+		},
+
+		"PSEUDO": function( pseudo, argument ) {
+			// pseudo-class names are case-insensitive
+			// http://www.w3.org/TR/selectors/#pseudo-classes
+			// Prioritize by case sensitivity in case custom pseudos are added with uppercase letters
+			// Remember that setFilters inherits from pseudos
+			var args,
+				fn = Expr.pseudos[ pseudo ] || Expr.setFilters[ pseudo.toLowerCase() ] ||
+					Sizzle.error( "unsupported pseudo: " + pseudo );
+
+			// The user may use createPseudo to indicate that
+			// arguments are needed to create the filter function
+			// just as Sizzle does
+			if ( fn[ expando ] ) {
+				return fn( argument );
+			}
+
+			// But maintain support for old signatures
+			if ( fn.length > 1 ) {
+				args = [ pseudo, pseudo, "", argument ];
+				return Expr.setFilters.hasOwnProperty( pseudo.toLowerCase() ) ?
+					markFunction(function( seed, matches ) {
+						var idx,
+							matched = fn( seed, argument ),
+							i = matched.length;
+						while ( i-- ) {
+							idx = indexOf.call( seed, matched[i] );
+							seed[ idx ] = !( matches[ idx ] = matched[i] );
+						}
+					}) :
+					function( elem ) {
+						return fn( elem, 0, args );
+					};
+			}
+
+			return fn;
+		}
+	},
+
+	pseudos: {
+		// Potentially complex pseudos
+		"not": markFunction(function( selector ) {
+			// Trim the selector passed to compile
+			// to avoid treating leading and trailing
+			// spaces as combinators
+			var input = [],
+				results = [],
+				matcher = compile( selector.replace( rtrim, "$1" ) );
+
+			return matcher[ expando ] ?
+				markFunction(function( seed, matches, context, xml ) {
+					var elem,
+						unmatched = matcher( seed, null, xml, [] ),
+						i = seed.length;
+
+					// Match elements unmatched by `matcher`
+					while ( i-- ) {
+						if ( (elem = unmatched[i]) ) {
+							seed[i] = !(matches[i] = elem);
+						}
+					}
+				}) :
+				function( elem, context, xml ) {
+					input[0] = elem;
+					matcher( input, null, xml, results );
+					return !results.pop();
+				};
+		}),
+
+		"has": markFunction(function( selector ) {
+			return function( elem ) {
+				return Sizzle( selector, elem ).length > 0;
+			};
+		}),
+
+		"contains": markFunction(function( text ) {
+			return function( elem ) {
+				return ( elem.textContent || elem.innerText || getText( elem ) ).indexOf( text ) > -1;
+			};
+		}),
+
+		// "Whether an element is represented by a :lang() selector
+		// is based solely on the element's language value
+		// being equal to the identifier C,
+		// or beginning with the identifier C immediately followed by "-".
+		// The matching of C against the element's language value is performed case-insensitively.
+		// The identifier C does not have to be a valid language name."
+		// http://www.w3.org/TR/selectors/#lang-pseudo
+		"lang": markFunction( function( lang ) {
+			// lang value must be a valid identifier
+			if ( !ridentifier.test(lang || "") ) {
+				Sizzle.error( "unsupported lang: " + lang );
+			}
+			lang = lang.replace( runescape, funescape ).toLowerCase();
+			return function( elem ) {
+				var elemLang;
+				do {
+					if ( (elemLang = documentIsHTML ?
+						elem.lang :
+						elem.getAttribute("xml:lang") || elem.getAttribute("lang")) ) {
+
+						elemLang = elemLang.toLowerCase();
+						return elemLang === lang || elemLang.indexOf( lang + "-" ) === 0;
+					}
+				} while ( (elem = elem.parentNode) && elem.nodeType === 1 );
+				return false;
+			};
+		}),
+
+		// Miscellaneous
+		"target": function( elem ) {
+			var hash = window.location && window.location.hash;
+			return hash && hash.slice( 1 ) === elem.id;
+		},
+
+		"root": function( elem ) {
+			return elem === docElem;
+		},
+
+		"focus": function( elem ) {
+			return elem === document.activeElement && (!document.hasFocus || document.hasFocus()) && !!(elem.type || elem.href || ~elem.tabIndex);
+		},
+
+		// Boolean properties
+		"enabled": function( elem ) {
+			return elem.disabled === false;
+		},
+
+		"disabled": function( elem ) {
+			return elem.disabled === true;
+		},
+
+		"checked": function( elem ) {
+			// In CSS3, :checked should return both checked and selected elements
+			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
+			var nodeName = elem.nodeName.toLowerCase();
+			return (nodeName === "input" && !!elem.checked) || (nodeName === "option" && !!elem.selected);
+		},
+
+		"selected": function( elem ) {
+			// Accessing this property makes selected-by-default
+			// options in Safari work properly
+			if ( elem.parentNode ) {
+				elem.parentNode.selectedIndex;
+			}
+
+			return elem.selected === true;
+		},
+
+		// Contents
+		"empty": function( elem ) {
+			// http://www.w3.org/TR/selectors/#empty-pseudo
+			// :empty is negated by element (1) or content nodes (text: 3; cdata: 4; entity ref: 5),
+			//   but not by others (comment: 8; processing instruction: 7; etc.)
+			// nodeType < 6 works because attributes (2) do not appear as children
+			for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
+				if ( elem.nodeType < 6 ) {
+					return false;
+				}
+			}
+			return true;
+		},
+
+		"parent": function( elem ) {
+			return !Expr.pseudos["empty"]( elem );
+		},
+
+		// Element/input types
+		"header": function( elem ) {
+			return rheader.test( elem.nodeName );
+		},
+
+		"input": function( elem ) {
+			return rinputs.test( elem.nodeName );
+		},
+
+		"button": function( elem ) {
+			var name = elem.nodeName.toLowerCase();
+			return name === "input" && elem.type === "button" || name === "button";
+		},
+
+		"text": function( elem ) {
+			var attr;
+			return elem.nodeName.toLowerCase() === "input" &&
+				elem.type === "text" &&
+
+				// Support: IE<8
+				// New HTML5 attribute values (e.g., "search") appear with elem.type === "text"
+				( (attr = elem.getAttribute("type")) == null || attr.toLowerCase() === "text" );
+		},
+
+		// Position-in-collection
+		"first": createPositionalPseudo(function() {
+			return [ 0 ];
+		}),
+
+		"last": createPositionalPseudo(function( matchIndexes, length ) {
+			return [ length - 1 ];
+		}),
+
+		"eq": createPositionalPseudo(function( matchIndexes, length, argument ) {
+			return [ argument < 0 ? argument + length : argument ];
+		}),
+
+		"even": createPositionalPseudo(function( matchIndexes, length ) {
+			var i = 0;
+			for ( ; i < length; i += 2 ) {
+				matchIndexes.push( i );
+			}
+			return matchIndexes;
+		}),
+
+		"odd": createPositionalPseudo(function( matchIndexes, length ) {
+			var i = 1;
+			for ( ; i < length; i += 2 ) {
+				matchIndexes.push( i );
+			}
+			return matchIndexes;
+		}),
+
+		"lt": createPositionalPseudo(function( matchIndexes, length, argument ) {
+			var i = argument < 0 ? argument + length : argument;
+			for ( ; --i >= 0; ) {
+				matchIndexes.push( i );
+			}
+			return matchIndexes;
+		}),
+
+		"gt": createPositionalPseudo(function( matchIndexes, length, argument ) {
+			var i = argument < 0 ? argument + length : argument;
+			for ( ; ++i < length; ) {
+				matchIndexes.push( i );
+			}
+			return matchIndexes;
+		})
+	}
+};
+
+Expr.pseudos["nth"] = Expr.pseudos["eq"];
+
+// Add button/input type pseudos
+for ( i in { radio: true, checkbox: true, file: true, password: true, image: true } ) {
+	Expr.pseudos[ i ] = createInputPseudo( i );
+}
+for ( i in { submit: true, reset: true } ) {
+	Expr.pseudos[ i ] = createButtonPseudo( i );
+}
+
+// Easy API for creating new setFilters
+function setFilters() {}
+setFilters.prototype = Expr.filters = Expr.pseudos;
+Expr.setFilters = new setFilters();
+
+tokenize = Sizzle.tokenize = function( selector, parseOnly ) {
+	var matched, match, tokens, type,
+		soFar, groups, preFilters,
+		cached = tokenCache[ selector + " " ];
+
+	if ( cached ) {
+		return parseOnly ? 0 : cached.slice( 0 );
+	}
+
+	soFar = selector;
+	groups = [];
+	preFilters = Expr.preFilter;
+
+	while ( soFar ) {
+
+		// Comma and first run
+		if ( !matched || (match = rcomma.exec( soFar )) ) {
+			if ( match ) {
+				// Don't consume trailing commas as valid
+				soFar = soFar.slice( match[0].length ) || soFar;
+			}
+			groups.push( (tokens = []) );
+		}
+
+		matched = false;
+
+		// Combinators
+		if ( (match = rcombinators.exec( soFar )) ) {
+			matched = match.shift();
+			tokens.push({
+				value: matched,
+				// Cast descendant combinators to space
+				type: match[0].replace( rtrim, " " )
+			});
+			soFar = soFar.slice( matched.length );
+		}
+
+		// Filters
+		for ( type in Expr.filter ) {
+			if ( (match = matchExpr[ type ].exec( soFar )) && (!preFilters[ type ] ||
+				(match = preFilters[ type ]( match ))) ) {
+				matched = match.shift();
+				tokens.push({
+					value: matched,
+					type: type,
+					matches: match
+				});
+				soFar = soFar.slice( matched.length );
+			}
+		}
+
+		if ( !matched ) {
+			break;
+		}
+	}
+
+	// Return the length of the invalid excess
+	// if we're just parsing
+	// Otherwise, throw an error or return tokens
+	return parseOnly ?
+		soFar.length :
+		soFar ?
+			Sizzle.error( selector ) :
+			// Cache the tokens
+			tokenCache( selector, groups ).slice( 0 );
+};
+
+function toSelector( tokens ) {
+	var i = 0,
+		len = tokens.length,
+		selector = "";
+	for ( ; i < len; i++ ) {
+		selector += tokens[i].value;
+	}
+	return selector;
+}
+
+function addCombinator( matcher, combinator, base ) {
+	var dir = combinator.dir,
+		checkNonElements = base && dir === "parentNode",
+		doneName = done++;
+
+	return combinator.first ?
+		// Check against closest ancestor/preceding element
+		function( elem, context, xml ) {
+			while ( (elem = elem[ dir ]) ) {
+				if ( elem.nodeType === 1 || checkNonElements ) {
+					return matcher( elem, context, xml );
+				}
+			}
+		} :
+
+		// Check against all ancestor/preceding elements
+		function( elem, context, xml ) {
+			var oldCache, outerCache,
+				newCache = [ dirruns, doneName ];
+
+			// We can't set arbitrary data on XML nodes, so they don't benefit from dir caching
+			if ( xml ) {
+				while ( (elem = elem[ dir ]) ) {
+					if ( elem.nodeType === 1 || checkNonElements ) {
+						if ( matcher( elem, context, xml ) ) {
+							return true;
+						}
+					}
+				}
+			} else {
+				while ( (elem = elem[ dir ]) ) {
+					if ( elem.nodeType === 1 || checkNonElements ) {
+						outerCache = elem[ expando ] || (elem[ expando ] = {});
+						if ( (oldCache = outerCache[ dir ]) &&
+							oldCache[ 0 ] === dirruns && oldCache[ 1 ] === doneName ) {
+
+							// Assign to newCache so results back-propagate to previous elements
+							return (newCache[ 2 ] = oldCache[ 2 ]);
+						} else {
+							// Reuse newcache so results back-propagate to previous elements
+							outerCache[ dir ] = newCache;
+
+							// A match means we're done; a fail means we have to keep checking
+							if ( (newCache[ 2 ] = matcher( elem, context, xml )) ) {
+								return true;
+							}
+						}
+					}
+				}
+			}
+		};
+}
+
+function elementMatcher( matchers ) {
+	return matchers.length > 1 ?
+		function( elem, context, xml ) {
+			var i = matchers.length;
+			while ( i-- ) {
+				if ( !matchers[i]( elem, context, xml ) ) {
+					return false;
+				}
+			}
+			return true;
+		} :
+		matchers[0];
+}
+
+function multipleContexts( selector, contexts, results ) {
+	var i = 0,
+		len = contexts.length;
+	for ( ; i < len; i++ ) {
+		Sizzle( selector, contexts[i], results );
+	}
+	return results;
+}
+
+function condense( unmatched, map, filter, context, xml ) {
+	var elem,
+		newUnmatched = [],
+		i = 0,
+		len = unmatched.length,
+		mapped = map != null;
+
+	for ( ; i < len; i++ ) {
+		if ( (elem = unmatched[i]) ) {
+			if ( !filter || filter( elem, context, xml ) ) {
+				newUnmatched.push( elem );
+				if ( mapped ) {
+					map.push( i );
+				}
+			}
+		}
+	}
+
+	return newUnmatched;
+}
+
+function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postSelector ) {
+	if ( postFilter && !postFilter[ expando ] ) {
+		postFilter = setMatcher( postFilter );
+	}
+	if ( postFinder && !postFinder[ expando ] ) {
+		postFinder = setMatcher( postFinder, postSelector );
+	}
+	return markFunction(function( seed, results, context, xml ) {
+		var temp, i, elem,
+			preMap = [],
+			postMap = [],
+			preexisting = results.length,
+
+			// Get initial elements from seed or context
+			elems = seed || multipleContexts( selector || "*", context.nodeType ? [ context ] : context, [] ),
+
+			// Prefilter to get matcher input, preserving a map for seed-results synchronization
+			matcherIn = preFilter && ( seed || !selector ) ?
+				condense( elems, preMap, preFilter, context, xml ) :
+				elems,
+
+			matcherOut = matcher ?
+				// If we have a postFinder, or filtered seed, or non-seed postFilter or preexisting results,
+				postFinder || ( seed ? preFilter : preexisting || postFilter ) ?
+
+					// ...intermediate processing is necessary
+					[] :
+
+					// ...otherwise use results directly
+					results :
+				matcherIn;
+
+		// Find primary matches
+		if ( matcher ) {
+			matcher( matcherIn, matcherOut, context, xml );
+		}
+
+		// Apply postFilter
+		if ( postFilter ) {
+			temp = condense( matcherOut, postMap );
+			postFilter( temp, [], context, xml );
+
+			// Un-match failing elements by moving them back to matcherIn
+			i = temp.length;
+			while ( i-- ) {
+				if ( (elem = temp[i]) ) {
+					matcherOut[ postMap[i] ] = !(matcherIn[ postMap[i] ] = elem);
+				}
+			}
+		}
+
+		if ( seed ) {
+			if ( postFinder || preFilter ) {
+				if ( postFinder ) {
+					// Get the final matcherOut by condensing this intermediate into postFinder contexts
+					temp = [];
+					i = matcherOut.length;
+					while ( i-- ) {
+						if ( (elem = matcherOut[i]) ) {
+							// Restore matcherIn since elem is not yet a final match
+							temp.push( (matcherIn[i] = elem) );
+						}
+					}
+					postFinder( null, (matcherOut = []), temp, xml );
+				}
+
+				// Move matched elements from seed to results to keep them synchronized
+				i = matcherOut.length;
+				while ( i-- ) {
+					if ( (elem = matcherOut[i]) &&
+						(temp = postFinder ? indexOf.call( seed, elem ) : preMap[i]) > -1 ) {
+
+						seed[temp] = !(results[temp] = elem);
+					}
+				}
+			}
+
+		// Add elements to results, through postFinder if defined
+		} else {
+			matcherOut = condense(
+				matcherOut === results ?
+					matcherOut.splice( preexisting, matcherOut.length ) :
+					matcherOut
+			);
+			if ( postFinder ) {
+				postFinder( null, results, matcherOut, xml );
+			} else {
+				push.apply( results, matcherOut );
+			}
+		}
+	});
+}
+
+function matcherFromTokens( tokens ) {
+	var checkContext, matcher, j,
+		len = tokens.length,
+		leadingRelative = Expr.relative[ tokens[0].type ],
+		implicitRelative = leadingRelative || Expr.relative[" "],
+		i = leadingRelative ? 1 : 0,
+
+		// The foundational matcher ensures that elements are reachable from top-level context(s)
+		matchContext = addCombinator( function( elem ) {
+			return elem === checkContext;
+		}, implicitRelative, true ),
+		matchAnyContext = addCombinator( function( elem ) {
+			return indexOf.call( checkContext, elem ) > -1;
+		}, implicitRelative, true ),
+		matchers = [ function( elem, context, xml ) {
+			return ( !leadingRelative && ( xml || context !== outermostContext ) ) || (
+				(checkContext = context).nodeType ?
+					matchContext( elem, context, xml ) :
+					matchAnyContext( elem, context, xml ) );
+		} ];
+
+	for ( ; i < len; i++ ) {
+		if ( (matcher = Expr.relative[ tokens[i].type ]) ) {
+			matchers = [ addCombinator(elementMatcher( matchers ), matcher) ];
+		} else {
+			matcher = Expr.filter[ tokens[i].type ].apply( null, tokens[i].matches );
+
+			// Return special upon seeing a positional matcher
+			if ( matcher[ expando ] ) {
+				// Find the next relative operator (if any) for proper handling
+				j = ++i;
+				for ( ; j < len; j++ ) {
+					if ( Expr.relative[ tokens[j].type ] ) {
+						break;
+					}
+				}
+				return setMatcher(
+					i > 1 && elementMatcher( matchers ),
+					i > 1 && toSelector(
+						// If the preceding token was a descendant combinator, insert an implicit any-element `*`
+						tokens.slice( 0, i - 1 ).concat({ value: tokens[ i - 2 ].type === " " ? "*" : "" })
+					).replace( rtrim, "$1" ),
+					matcher,
+					i < j && matcherFromTokens( tokens.slice( i, j ) ),
+					j < len && matcherFromTokens( (tokens = tokens.slice( j )) ),
+					j < len && toSelector( tokens )
+				);
+			}
+			matchers.push( matcher );
+		}
+	}
+
+	return elementMatcher( matchers );
+}
+
+function matcherFromGroupMatchers( elementMatchers, setMatchers ) {
+	var bySet = setMatchers.length > 0,
+		byElement = elementMatchers.length > 0,
+		superMatcher = function( seed, context, xml, results, outermost ) {
+			var elem, j, matcher,
+				matchedCount = 0,
+				i = "0",
+				unmatched = seed && [],
+				setMatched = [],
+				contextBackup = outermostContext,
+				// We must always have either seed elements or outermost context
+				elems = seed || byElement && Expr.find["TAG"]( "*", outermost ),
+				// Use integer dirruns iff this is the outermost matcher
+				dirrunsUnique = (dirruns += contextBackup == null ? 1 : Math.random() || 0.1),
+				len = elems.length;
+
+			if ( outermost ) {
+				outermostContext = context !== document && context;
+			}
+
+			// Add elements passing elementMatchers directly to results
+			// Keep `i` a string if there are no elements so `matchedCount` will be "00" below
+			// Support: IE<9, Safari
+			// Tolerate NodeList properties (IE: "length"; Safari: <number>) matching elements by id
+			for ( ; i !== len && (elem = elems[i]) != null; i++ ) {
+				if ( byElement && elem ) {
+					j = 0;
+					while ( (matcher = elementMatchers[j++]) ) {
+						if ( matcher( elem, context, xml ) ) {
+							results.push( elem );
+							break;
+						}
+					}
+					if ( outermost ) {
+						dirruns = dirrunsUnique;
+					}
+				}
+
+				// Track unmatched elements for set filters
+				if ( bySet ) {
+					// They will have gone through all possible matchers
+					if ( (elem = !matcher && elem) ) {
+						matchedCount--;
+					}
+
+					// Lengthen the array for every element, matched or not
+					if ( seed ) {
+						unmatched.push( elem );
+					}
+				}
+			}
+
+			// Apply set filters to unmatched elements
+			matchedCount += i;
+			if ( bySet && i !== matchedCount ) {
+				j = 0;
+				while ( (matcher = setMatchers[j++]) ) {
+					matcher( unmatched, setMatched, context, xml );
+				}
+
+				if ( seed ) {
+					// Reintegrate element matches to eliminate the need for sorting
+					if ( matchedCount > 0 ) {
+						while ( i-- ) {
+							if ( !(unmatched[i] || setMatched[i]) ) {
+								setMatched[i] = pop.call( results );
+							}
+						}
+					}
+
+					// Discard index placeholder values to get only actual matches
+					setMatched = condense( setMatched );
+				}
+
+				// Add matches to results
+				push.apply( results, setMatched );
+
+				// Seedless set matches succeeding multiple successful matchers stipulate sorting
+				if ( outermost && !seed && setMatched.length > 0 &&
+					( matchedCount + setMatchers.length ) > 1 ) {
+
+					Sizzle.uniqueSort( results );
+				}
+			}
+
+			// Override manipulation of globals by nested matchers
+			if ( outermost ) {
+				dirruns = dirrunsUnique;
+				outermostContext = contextBackup;
+			}
+
+			return unmatched;
+		};
+
+	return bySet ?
+		markFunction( superMatcher ) :
+		superMatcher;
+}
+
+compile = Sizzle.compile = function( selector, match /* Internal Use Only */ ) {
+	var i,
+		setMatchers = [],
+		elementMatchers = [],
+		cached = compilerCache[ selector + " " ];
+
+	if ( !cached ) {
+		// Generate a function of recursive functions that can be used to check each element
+		if ( !match ) {
+			match = tokenize( selector );
+		}
+		i = match.length;
+		while ( i-- ) {
+			cached = matcherFromTokens( match[i] );
+			if ( cached[ expando ] ) {
+				setMatchers.push( cached );
+			} else {
+				elementMatchers.push( cached );
+			}
+		}
+
+		// Cache the compiled function
+		cached = compilerCache( selector, matcherFromGroupMatchers( elementMatchers, setMatchers ) );
+
+		// Save selector and tokenization
+		cached.selector = selector;
+	}
+	return cached;
+};
+
+/**
+ * A low-level selection function that works with Sizzle's compiled
+ *  selector functions
+ * @param {String|Function} selector A selector or a pre-compiled
+ *  selector function built with Sizzle.compile
+ * @param {Element} context
+ * @param {Array} [results]
+ * @param {Array} [seed] A set of elements to match against
+ */
+select = Sizzle.select = function( selector, context, results, seed ) {
+	var i, tokens, token, type, find,
+		compiled = typeof selector === "function" && selector,
+		match = !seed && tokenize( (selector = compiled.selector || selector) );
+
+	results = results || [];
+
+	// Try to minimize operations if there is no seed and only one group
+	if ( match.length === 1 ) {
+
+		// Take a shortcut and set the context if the root selector is an ID
+		tokens = match[0] = match[0].slice( 0 );
+		if ( tokens.length > 2 && (token = tokens[0]).type === "ID" &&
+				support.getById && context.nodeType === 9 && documentIsHTML &&
+				Expr.relative[ tokens[1].type ] ) {
+
+			context = ( Expr.find["ID"]( token.matches[0].replace(runescape, funescape), context ) || [] )[0];
+			if ( !context ) {
+				return results;
+
+			// Precompiled matchers will still verify ancestry, so step up a level
+			} else if ( compiled ) {
+				context = context.parentNode;
+			}
+
+			selector = selector.slice( tokens.shift().value.length );
+		}
+
+		// Fetch a seed set for right-to-left matching
+		i = matchExpr["needsContext"].test( selector ) ? 0 : tokens.length;
+		while ( i-- ) {
+			token = tokens[i];
+
+			// Abort if we hit a combinator
+			if ( Expr.relative[ (type = token.type) ] ) {
+				break;
+			}
+			if ( (find = Expr.find[ type ]) ) {
+				// Search, expanding context for leading sibling combinators
+				if ( (seed = find(
+					token.matches[0].replace( runescape, funescape ),
+					rsibling.test( tokens[0].type ) && testContext( context.parentNode ) || context
+				)) ) {
+
+					// If seed is empty or no tokens remain, we can return early
+					tokens.splice( i, 1 );
+					selector = seed.length && toSelector( tokens );
+					if ( !selector ) {
+						push.apply( results, seed );
+						return results;
+					}
+
+					break;
+				}
+			}
+		}
+	}
+
+	// Compile and execute a filtering function if one is not provided
+	// Provide `match` to avoid retokenization if we modified the selector above
+	( compiled || compile( selector, match ) )(
+		seed,
+		context,
+		!documentIsHTML,
+		results,
+		rsibling.test( selector ) && testContext( context.parentNode ) || context
+	);
+	return results;
+};
+
+// One-time assignments
+
+// Sort stability
+support.sortStable = expando.split("").sort( sortOrder ).join("") === expando;
+
+// Support: Chrome<14
+// Always assume duplicates if they aren't passed to the comparison function
+support.detectDuplicates = !!hasDuplicate;
+
+// Initialize against the default document
+setDocument();
+
+// Support: Webkit<537.32 - Safari 6.0.3/Chrome 25 (fixed in Chrome 27)
+// Detached nodes confoundingly follow *each other*
+support.sortDetached = assert(function( div1 ) {
+	// Should return 1, but returns 4 (following)
+	return div1.compareDocumentPosition( document.createElement("div") ) & 1;
+});
+
+// Support: IE<8
+// Prevent attribute/property "interpolation"
+// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
+if ( !assert(function( div ) {
+	div.innerHTML = "<a href='#'></a>";
+	return div.firstChild.getAttribute("href") === "#" ;
+}) ) {
+	addHandle( "type|href|height|width", function( elem, name, isXML ) {
+		if ( !isXML ) {
+			return elem.getAttribute( name, name.toLowerCase() === "type" ? 1 : 2 );
+		}
+	});
+}
+
+// Support: IE<9
+// Use defaultValue in place of getAttribute("value")
+if ( !support.attributes || !assert(function( div ) {
+	div.innerHTML = "<input/>";
+	div.firstChild.setAttribute( "value", "" );
+	return div.firstChild.getAttribute( "value" ) === "";
+}) ) {
+	addHandle( "value", function( elem, name, isXML ) {
+		if ( !isXML && elem.nodeName.toLowerCase() === "input" ) {
+			return elem.defaultValue;
+		}
+	});
+}
+
+// Support: IE<9
+// Use getAttributeNode to fetch booleans when getAttribute lies
+if ( !assert(function( div ) {
+	return div.getAttribute("disabled") == null;
+}) ) {
+	addHandle( booleans, function( elem, name, isXML ) {
+		var val;
+		if ( !isXML ) {
+			return elem[ name ] === true ? name.toLowerCase() :
+					(val = elem.getAttributeNode( name )) && val.specified ?
+					val.value :
+				null;
+		}
+	});
+}
+
+return Sizzle;
+
+})( window );
+
+
+
+jQuery.find = Sizzle;
+jQuery.expr = Sizzle.selectors;
+jQuery.expr[":"] = jQuery.expr.pseudos;
+jQuery.unique = Sizzle.uniqueSort;
+jQuery.text = Sizzle.getText;
+jQuery.isXMLDoc = Sizzle.isXML;
+jQuery.contains = Sizzle.contains;
+
+
+
+var rneedsContext = jQuery.expr.match.needsContext;
+
+var rsingleTag = (/^<(\w+)\s*\/?>(?:<\/\1>|)$/);
+
+
+
+var risSimple = /^.[^:#\[\.,]*$/;
+
+// Implement the identical functionality for filter and not
+function winnow( elements, qualifier, not ) {
+	if ( jQuery.isFunction( qualifier ) ) {
+		return jQuery.grep( elements, function( elem, i ) {
+			/* jshint -W018 */
+			return !!qualifier.call( elem, i, elem ) !== not;
+		});
+
+	}
+
+	if ( qualifier.nodeType ) {
+		return jQuery.grep( elements, function( elem ) {
+			return ( elem === qualifier ) !== not;
+		});
+
+	}
+
+	if ( typeof qualifier === "string" ) {
+		if ( risSimple.test( qualifier ) ) {
+			return jQuery.filter( qualifier, elements, not );
+		}
+
+		qualifier = jQuery.filter( qualifier, elements );
+	}
+
+	return jQuery.grep( elements, function( elem ) {
+		return ( jQuery.inArray( elem, qualifier ) >= 0 ) !== not;
+	});
+}
+
+jQuery.filter = function( expr, elems, not ) {
+	var elem = elems[ 0 ];
+
+	if ( not ) {
+		expr = ":not(" + expr + ")";
+	}
+
+	return elems.length === 1 && elem.nodeType === 1 ?
+		jQuery.find.matchesSelector( elem, expr ) ? [ elem ] : [] :
+		jQuery.find.matches( expr, jQuery.grep( elems, function( elem ) {
+			return elem.nodeType === 1;
+		}));
+};
+
+jQuery.fn.extend({
+	find: function( selector ) {
+		var i,
+			ret = [],
+			self = this,
+			len = self.length;
+
+		if ( typeof selector !== "string" ) {
+			return this.pushStack( jQuery( selector ).filter(function() {
+				for ( i = 0; i < len; i++ ) {
+					if ( jQuery.contains( self[ i ], this ) ) {
+						return true;
+					}
+				}
+			}) );
+		}
+
+		for ( i = 0; i < len; i++ ) {
+			jQuery.find( selector, self[ i ], ret );
+		}
+
+		// Needed because $( selector, context ) becomes $( context ).find( selector )
+		ret = this.pushStack( len > 1 ? jQuery.unique( ret ) : ret );
+		ret.selector = this.selector ? this.selector + " " + selector : selector;
+		return ret;
+	},
+	filter: function( selector ) {
+		return this.pushStack( winnow(this, selector || [], false) );
+	},
+	not: function( selector ) {
+		return this.pushStack( winnow(this, selector || [], true) );
+	},
+	is: function( selector ) {
+		return !!winnow(
+			this,
+
+			// If this is a positional/relative selector, check membership in the returned set
+			// so $("p:first").is("p:last") won't return true for a doc with two "p".
+			typeof selector === "string" && rneedsContext.test( selector ) ?
+				jQuery( selector ) :
+				selector || [],
+			false
+		).length;
+	}
+});
+
+
+// Initialize a jQuery object
+
+
+// A central reference to the root jQuery(document)
+var rootjQuery,
+
+	// Use the correct document accordingly with window argument (sandbox)
+	document = window.document,
+
+	// A simple way to check for HTML strings
+	// Prioritize #id over <tag> to avoid XSS via location.hash (#9521)
+	// Strict HTML recognition (#11290: must start with <)
+	rquickExpr = /^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,
+
+	init = jQuery.fn.init = function( selector, context ) {
+		var match, elem;
+
+		// HANDLE: $(""), $(null), $(undefined), $(false)
+		if ( !selector ) {
+			return this;
+		}
+
+		// Handle HTML strings
+		if ( typeof selector === "string" ) {
+			if ( selector.charAt(0) === "<" && selector.charAt( selector.length - 1 ) === ">" && selector.length >= 3 ) {
+				// Assume that strings that start and end with <> are HTML and skip the regex check
+				match = [ null, selector, null ];
+
+			} else {
+				match = rquickExpr.exec( selector );
+			}
+
+			// Match html or make sure no context is specified for #id
+			if ( match && (match[1] || !context) ) {
+
+				// HANDLE: $(html) -> $(array)
+				if ( match[1] ) {
+					context = context instanceof jQuery ? context[0] : context;
+
+					// scripts is true for back-compat
+					// Intentionally let the error be thrown if parseHTML is not present
+					jQuery.merge( this, jQuery.parseHTML(
+						match[1],
+						context && context.nodeType ? context.ownerDocument || context : document,
+						true
+					) );
+
+					// HANDLE: $(html, props)
+					if ( rsingleTag.test( match[1] ) && jQuery.isPlainObject( context ) ) {
+						for ( match in context ) {
+							// Properties of context are called as methods if possible
+							if ( jQuery.isFunction( this[ match ] ) ) {
+								this[ match ]( context[ match ] );
+
+							// ...and otherwise set as attributes
+							} else {
+								this.attr( match, context[ match ] );
+							}
+						}
+					}
+
+					return this;
+
+				// HANDLE: $(#id)
+				} else {
+					elem = document.getElementById( match[2] );
+
+					// Check parentNode to catch when Blackberry 4.6 returns
+					// nodes that are no longer in the document #6963
+					if ( elem && elem.parentNode ) {
+						// Handle the case where IE and Opera return items
+						// by name instead of ID
+						if ( elem.id !== match[2] ) {
+							return rootjQuery.find( selector );
+						}
+
+						// Otherwise, we inject the element directly into the jQuery object
+						this.length = 1;
+						this[0] = elem;
+					}
+
+					this.context = document;
+					this.selector = selector;
+					return this;
+				}
+
+			// HANDLE: $(expr, $(...))
+			} else if ( !context || context.jquery ) {
+				return ( context || rootjQuery ).find( selector );
+
+			// HANDLE: $(expr, context)
+			// (which is just equivalent to: $(context).find(expr)
+			} else {
+				return this.constructor( context ).find( selector );
+			}
+
+		// HANDLE: $(DOMElement)
+		} else if ( selector.nodeType ) {
+			this.context = this[0] = selector;
+			this.length = 1;
+			return this;
+
+		// HANDLE: $(function)
+		// Shortcut for document ready
+		} else if ( jQuery.isFunction( selector ) ) {
+			return typeof rootjQuery.ready !== "undefined" ?
+				rootjQuery.ready( selector ) :
+				// Execute immediately if ready is not present
+				selector( jQuery );
+		}
+
+		if ( selector.selector !== undefined ) {
+			this.selector = selector.selector;
+			this.context = selector.context;
+		}
+
+		return jQuery.makeArray( selector, this );
+	};
+
+// Give the init function the jQuery prototype for later instantiation
+init.prototype = jQuery.fn;
+
+// Initialize central reference
+rootjQuery = jQuery( document );
+
+
+var rparentsprev = /^(?:parents|prev(?:Until|All))/,
+	// methods guaranteed to produce a unique set when starting from a unique set
+	guaranteedUnique = {
+		children: true,
+		contents: true,
+		next: true,
+		prev: true
+	};
+
+jQuery.extend({
+	dir: function( elem, dir, until ) {
+		var matched = [],
+			cur = elem[ dir ];
+
+		while ( cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery( cur ).is( until )) ) {
+			if ( cur.nodeType === 1 ) {
+				matched.push( cur );
+			}
+			cur = cur[dir];
+		}
+		return matched;
+	},
+
+	sibling: function( n, elem ) {
+		var r = [];
+
+		for ( ; n; n = n.nextSibling ) {
+			if ( n.nodeType === 1 && n !== elem ) {
+				r.push( n );
+			}
+		}
+
+		return r;
+	}
+});
+
+jQuery.fn.extend({
+	has: function( target ) {
+		var i,
+			targets = jQuery( target, this ),
+			len = targets.length;
+
+		return this.filter(function() {
+			for ( i = 0; i < len; i++ ) {
+				if ( jQuery.contains( this, targets[i] ) ) {
+					return true;
+				}
+			}
+		});
+	},
+
+	closest: function( selectors, context ) {
+		var cur,
+			i = 0,
+			l = this.length,
+			matched = [],
+			pos = rneedsContext.test( selectors ) || typeof selectors !== "string" ?
+				jQuery( selectors, context || this.context ) :
+				0;
+
+		for ( ; i < l; i++ ) {
+			for ( cur = this[i]; cur && cur !== context; cur = cur.parentNode ) {
+				// Always skip document fragments
+				if ( cur.nodeType < 11 && (pos ?
+					pos.index(cur) > -1 :
+
+					// Don't pass non-elements to Sizzle
+					cur.nodeType === 1 &&
+						jQuery.find.matchesSelector(cur, selectors)) ) {
+
+					matched.push( cur );
+					break;
+				}
+			}
+		}
+
+		return this.pushStack( matched.length > 1 ? jQuery.unique( matched ) : matched );
+	},
+
+	// Determine the position of an element within
+	// the matched set of elements
+	index: function( elem ) {
+
+		// No argument, return index in parent
+		if ( !elem ) {
+			return ( this[0] && this[0].parentNode ) ? this.first().prevAll().length : -1;
+		}
+
+		// index in selector
+		if ( typeof elem === "string" ) {
+			return jQuery.inArray( this[0], jQuery( elem ) );
+		}
+
+		// Locate the position of the desired element
+		return jQuery.inArray(
+			// If it receives a jQuery object, the first element is used
+			elem.jquery ? elem[0] : elem, this );
+	},
+
+	add: function( selector, context ) {
+		return this.pushStack(
+			jQuery.unique(
+				jQuery.merge( this.get(), jQuery( selector, context ) )
+			)
+		);
+	},
+
+	addBack: function( selector ) {
+		return this.add( selector == null ?
+			this.prevObject : this.prevObject.filter(selector)
+		);
+	}
+});
+
+function sibling( cur, dir ) {
+	do {
+		cur = cur[ dir ];
+	} while ( cur && cur.nodeType !== 1 );
+
+	return cur;
+}
+
+jQuery.each({
+	parent: function( elem ) {
+		var parent = elem.parentNode;
+		return parent && parent.nodeType !== 11 ? parent : null;
+	},
+	parents: function( elem ) {
+		return jQuery.dir( elem, "parentNode" );
+	},
+	parentsUntil: function( elem, i, until ) {
+		return jQuery.dir( elem, "parentNode", until );
+	},
+	next: function( elem ) {
+		return sibling( elem, "nextSibling" );
+	},
+	prev: function( elem ) {
+		return sibling( elem, "previousSibling" );
+	},
+	nextAll: function( elem ) {
+		return jQuery.dir( elem, "nextSibling" );
+	},
+	prevAll: function( elem ) {
+		return jQuery.dir( elem, "previousSibling" );
+	},
+	nextUntil: function( elem, i, until ) {
+		return jQuery.dir( elem, "nextSibling", until );
+	},
+	prevUntil: function( elem, i, until ) {
+		return jQuery.dir( elem, "previousSibling", until );
+	},
+	siblings: function( elem ) {
+		return jQuery.sibling( ( elem.parentNode || {} ).firstChild, elem );
+	},
+	children: function( elem ) {
+		return jQuery.sibling( elem.firstChild );
+	},
+	contents: function( elem ) {
+		return jQuery.nodeName( elem, "iframe" ) ?
+			elem.contentDocument || elem.contentWindow.document :
+			jQuery.merge( [], elem.childNodes );
+	}
+}, function( name, fn ) {
+	jQuery.fn[ name ] = function( until, selector ) {
+		var ret = jQuery.map( this, fn, until );
+
+		if ( name.slice( -5 ) !== "Until" ) {
+			selector = until;
+		}
+
+		if ( selector && typeof selector === "string" ) {
+			ret = jQuery.filter( selector, ret );
+		}
+
+		if ( this.length > 1 ) {
+			// Remove duplicates
+			if ( !guaranteedUnique[ name ] ) {
+				ret = jQuery.unique( ret );
+			}
+
+			// Reverse order for parents* and prev-derivatives
+			if ( rparentsprev.test( name ) ) {
+				ret = ret.reverse();
+			}
+		}
+
+		return this.pushStack( ret );
+	};
+});
+var rnotwhite = (/\S+/g);
+
+
+
+// String to Object options format cache
+var optionsCache = {};
+
+// Convert String-formatted options into Object-formatted ones and store in cache
+function createOptions( options ) {
+	var object = optionsCache[ options ] = {};
+	jQuery.each( options.match( rnotwhite ) || [], function( _, flag ) {
+		object[ flag ] = true;
+	});
+	return object;
+}
+
+/*
+ * Create a callback list using the following parameters:
+ *
+ *	options: an optional list of space-separated options that will change how
+ *			the callback list behaves or a more traditional option object
+ *
+ * By default a callback list will act like an event callback list and can be
+ * "fired" multiple times.
+ *
+ * Possible options:
+ *
+ *	once:			will ensure the callback list can only be fired once (like a Deferred)
+ *
+ *	memory:			will keep track of previous values and will call any callback added
+ *					after the list has been fired right away with the latest "memorized"
+ *					values (like a Deferred)
+ *
+ *	unique:			will ensure a callback can only be added once (no duplicate in the list)
+ *
+ *	stopOnFalse:	interrupt callings when a callback returns false
+ *
+ */
+jQuery.Callbacks = function( options ) {
+
+	// Convert options from String-formatted to Object-formatted if needed
+	// (we check in cache first)
+	options = typeof options === "string" ?
+		( optionsCache[ options ] || createOptions( options ) ) :
+		jQuery.extend( {}, options );
+
+	var // Flag to know if list is currently firing
+		firing,
+		// Last fire value (for non-forgettable lists)
+		memory,
+		// Flag to know if list was already fired
+		fired,
+		// End of the loop when firing
+		firingLength,
+		// Index of currently firing callback (modified by remove if needed)
+		firingIndex,
+		// First callback to fire (used internally by add and fireWith)
+		firingStart,
+		// Actual callback list
+		list = [],
+		// Stack of fire calls for repeatable lists
+		stack = !options.once && [],
+		// Fire callbacks
+		fire = function( data ) {
+			memory = options.memory && data;
+			fired = true;
+			firingIndex = firingStart || 0;
+			firingStart = 0;
+			firingLength = list.length;
+			firing = true;
+			for ( ; list && firingIndex < firingLength; firingIndex++ ) {
+				if ( list[ firingIndex ].apply( data[ 0 ], data[ 1 ] ) === false && options.stopOnFalse ) {
+					memory = false; // To prevent further calls using add
+					break;
+				}
+			}
+			firing = false;
+			if ( list ) {
+				if ( stack ) {
+					if ( stack.length ) {
+						fire( stack.shift() );
+					}
+				} else if ( memory ) {
+					list = [];
+				} else {
+					self.disable();
+				}
+			}
+		},
+		// Actual Callbacks object
+		self = {
+			// Add a callback or a collection of callbacks to the list
+			add: function() {
+				if ( list ) {
+					// First, we save the current length
+					var start = list.length;
+					(function add( args ) {
+						jQuery.each( args, function( _, arg ) {
+							var type = jQuery.type( arg );
+							if ( type === "function" ) {
+								if ( !options.unique || !self.has( arg ) ) {
+									list.push( arg );
+								}
+							} else if ( arg && arg.length && type !== "stri

<TRUNCATED>

[59/60] [abbrv] incubator-usergrid git commit: Adding Push Documentation

[sn...@apache.org]

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e5979feb/docs/push-notifications/tutorial.md
----------------------------------------------------------------------
diff --git a/docs/push-notifications/tutorial.md b/docs/push-notifications/tutorial.md
new file mode 100644
index 0000000..f92347c
--- /dev/null
+++ b/docs/push-notifications/tutorial.md
@@ -0,0 +1,251 @@
+# Tutorial: Push notifications sample app
+In this tutorial, you'll use a sample app (iOS, Android, or PhoneGap) to send yourself a push notification with the API BaaS push notification API. You'll register with a push notification services (Apple APNs or Google GCM) to create the required security certificate or key, create the required API BaaS notifier to send a message, then modify, compile and run the sample app to see push notifications in action.
+
+<div class="admonition note"> <p class="first admonition-title">Note</p> <p class="last">

+For an overview of how to set up push notifications, including troubleshooting tips, see [Adding push notifications support](adding-push-support.html).
+</p></div>
+
+## Before you begin
+Before you can add support for push notifications, be sure that you're set up for the requirements described in Adding push notifications support.
+
+## Step 1: Download a sample app
+Sample push notification apps are included in the /samples directory of the following platform SDKs and plugins:
+
+* Native iOS [Download the SDK](http://www.apigee.com/docs/content/ios-sdk-redirect)
+
+* Native Android [Download the SDK](http://www.apigee.com/docs/content/android-sdk-redirect)
+
+* PhoneGap iOS & Android (HTML5) [Download the SDK](http://www.apigee.com/docs/content/javascript-sdk-redirect
+
+To begin this tutorial, download the sample app for the platform of your choice.
+
+__A note to PhoneGap developers__: PhoneGap requires a plugin to enable push notifications. The plugin is included in the sample apps in the JavaScript SDK. For new PhoneGap applications, [download the PhoneGap push plugin](https://github.com/phonegap-build/PushPlugin).
+
+## Step 2: Register with a notification service and generate a certificate/key
+To send push notifications you must register your app with the push notification service that corresponds to your app's platform. Once registered, the service will provide you with a certificate or key that you will provide when creating an API BaaS notifier.
+
+For a full walkthrough of how to register an app with a notification service and generate the necessary certificate/key, see [Registering with a notification service](registration.html).
+
+## Step 3: Create a notifier
+Notifiers are entities that carry your push notifications to a notification service. Once a notification service has verified that your notifier contains valid credentials, it will deliver your push notification to the devices of your app's users.
+
+For information on how to use the admin portal to create a notifier, see [Creating notifiers](creating-notifiers.html).
+
+## Step 4: Configure and run the sample app
+In this step, you'll open your sample app of choice in your IDE and configure it. The Android sample app can be run with an emulator, included in the Android Developer Tools. The iOS sample app must be run on an actual iOS device.
+
+The following sections provide platform-specific guidance for setting up and running the samples. However, this content assumes that you understand your development environment well enough to configure and work with projects.
+
+### iOS Dev Setup
+
+To configure and run the Native iOS push notification sample app, do the following:
+
+1. Open the iOS sample app with XCode by opening its .xcodeproj file.
+
+2. Make the following changes to __/Push Test/AppDelegate.m__:
+
+* __orgName__: Your Apigee organization.
+
+* __appName__: The app in your organization where you created the notifier. (For the sample, make sure it's "sandbox".)
+
+* __notifier__: Name of the notifier you created. (For the sample, make sure it's "appledev".).
+
+3. Plug your iOS device into your development machine.
+
+4. In Xcode, select __Window > Organizer__ to open the Xcode Organizer.
+
+5. Under __Devices__, select the device you plugged in, then click __Add to Member Center__. You may be prompted to log in with the Apple ID associated with your Apple Developer account.
+
+6. If prompted, select a Development Team to use for provisioning. This will be a team you've registered at the Apple developer portal.
+
+7. Log in to the [Apple Developer portal](https://developer.apple.com/) and create a provisioning profile that includes the App ID you chose when you registered the sample app with Apple APNs. For more information on how to create a provisioning profile, see "About provisioning profiles" below.
+
+8. Download the profile and add it into Xcode Organizer, in the Provisioning Profiles group under your plugged-in device.
+
+9. Close the Organizer.
+
+10. In Xcode, select the Project Navigator, then select the project root folder.
+
+11. In the __General__ tab, in the __Bundle Identifer__ box, enter the App ID associated with your provisioning profile.
+
+12. In the __Build Settings__ tab, under __Deployment__, for the __iOS Deployment Target__ select the iOS version on your connected device. The version is displayed in the Xcode Organizer.
+
+13. In the __Build Settings__ tab, under __Code Signing__, under __Code Signing Identity > Debug__, select the Apple signing certificate corresponding to your developer identity.
+
+.. image:: iospushsettings.png
+
+14. Click __Run__ to launch the sample on your iOS device.
+
+15. When the "codesign wants to sign using key <Your Name> in your keychain." dialog is displayed, click __Allow__.
+
+16. The project is now built, and the app is installed on your device. The first time you run the push sample app, your device will ask permission to allow push notifications. Tap __OK__.
+
+.. image:: iospushauth.png
+
+17. In the app, tap the __push to this device__ button to send yourself a push notification. If you have configured your notification to go to multiple devices, tap the __push to all devices__ button to send the push notification to all devices.
+
+.. image:: iospushfinal.png
+
+### PhoneGap iOS Dev Setup
+
+To configure and run the PhoneGap iOS push notification sample app, do the following:
+
+1. Open the iOS PhoneGap sample app with Xcode by opening its .xcodeproj file.
+
+2. Make the following changes in __/www/js/index.js__:
+
+* __orgName__: Your Apigee organization.
+
+* __appName__: The app in your organization where you created the notifier. (For the sample, make sure it's "sandbox".)
+
+* __notifier__: Name of the notifier you created.
+
+3. Plug your iOS device into your development machine.
+
+4. In Xcode, select __Window > Organizer__ to open the Xcode Organizer.
+
+5. Under __Devices__, select the device you plugged in, then click __Add to Member Center__. You may be prompted to log in with the Apple ID associated with your Apple Developer account.
+
+6. If prompted, select a Development Team to use for provisioning. This will be a team you've registered at the Apple developer portal.
+
+7. Log in to the [Apple Developer portal](https://developer.apple.com/) and create a provisioning profile that includes the App ID you chose when you registered the sample app with Apple APNs. For more information on how to create a provisioning profile, see "About provisioning profiles" below.
+
+8. Download the profile and add it into Xcode Organizer, in the Provisioning Profiles group under your plugged-in device.
+
+9. Close the Organizer.
+
+10. In Xcode, select the Project Navigator, then select the project root folder.
+
+11. In the __General__ tab, in the __Bundle Identifer__ box, enter the App ID associated with your provisioning profile.
+
+12. In the __Build Settings__ tab, under __Deployment__, for the __iOS Deployment Target__ select the iOS version on your connected device. The version is displayed in the Xcode Organizer.
+
+13. In the __Build Settings__ tab, under __Code Signing__, under __Code Signing Identity > Debug__, select the Apple signing certificate corresponding to your developer identity.
+
+.. image:: iospgsettings.png
+
+14. At the top of the IDE, ensure that the name for your plugged in device is displayed next to the target name, then click the Run button to launch the sample on your iOS device.
+
+15. If the "codesign wants to sign using key <your name> in your keychain" dialog is displayed, click __Allow__.
+
+16. The project is now built, and the app is installed on your device. The first time you run the push sample app, your device will ask permission to allow push notifications. Tap OK.
+
+17. In the app, tap the __Send a push with Phonegap!__ button to send yourself a push notification.
+
+.. image:: iospgapp.png
+
+### About iOS provisioning profiles
+For iOS app testing, you need a provisioning profile that's associated with an Apple ID. You set up the provisioning profile in the Apple developer portal, download the profile, and import it into Xcode.
+
+To set up a provisioning profile, you need to create an "iOS App Development" certificate in the Apple developer portal. For example, in the Apple APNs setup earlier in this tutorial, you created a certificate in the Apple developer portal to be used for push notifications. However, you won't be able to create a provisioning portal with just that certificate. You also need to create an "iOS App Development" certificate (the configuration settings don't matter), as shown in the following image.
+
+.. image:: iospgcert.png
+
+After you create an iOS App Development certificate, you can create a provisioning profile that includes your App ID/certificate for push notifications.
+
+### Android Dev Setup
+
+To configure and run the native Android push notification sample app, do the following:
+
+1. Make sure you have the latest Android SDK installed in your IDE, and that Android APIs have been installed via the Android SDK Manager.
+
+2. Import the native Android sample app project into your IDE
+
+3. Modify the following in __/src/com.ganyo.pushtest/Settings.java__:
+
+* __GCM_SENDER_ID__: Your Google Cloud Messaging (GCM) project number, as described in the Tutorial: Push notifications sample app.
+
+* __NOTIFIER__: Name of your notifier. (For the sample, make sure it's the name of the notifier you created.)
+
+* __ORG__: Your Apigee organization.
+
+* __APP__: The app in your organization where you created the notifier. (For the sample, make sure it's "sandbox".)
+
+* __USER__ and __PASSWORD__: Optional. If you created your notifier in an app other than "sandbox" (which doesn't require authentication), enter the username and password of one of your API BaaS admin users.
+
+4. In AndroidManifest.xml, be sure the proper Android permissions are included, such as READ_PHONE_STATE and VIBRATE.
+
+5. In your project properties, go to __Java Build Path > Libraries__ and add all the JAR files from the project's /libs directory.
+
+6. In the __Order and Export__ tab, move the JARs to the top of the list and select all the check boxes. Make sure the order and selections match the following image:
+
+.. image:: assettings.png
+
+7. If you're using an emulator, configure the emulator to use the Google APIs Level 16 target.
+
+.. image:: asemu.png
+ 
+8. Run the project as an Android Application. The IDE should compile the project and install the app on your device.
+
+9. Press the button on the app to send yourself a push notification.
+
+.. image:: asapp.png
+
+### PhoneGap Android Dev Setup
+
+To configure and run the PhoneGap Android push notification sample app, do the following:
+
+1. Make sure you have the latest Android SDK installed in your IDE, and that Android APIs have been installed via the Android SDK Manager.
+
+2. Import the PhoneGap Android sample app project into your IDE.
+
+3. Modify the following in __/assets/www/js/index.js__:
+
+* __orgName__: Your apigee organization.
+
+* __appName__: The app in your organization where you created the notifier. (For the sample, make sure it's "sandbox".)
+
+* __notifier__: Name of your notifier.
+
+* __senderID__: Your API project number (the project must support Google Cloud Messaging for Android (GCM)), as described in the [Registering with a notification service](registration.html).
+
+4. In __AndroidManifest.xml__, be sure the proper Android permissions are included. This includes READ_PHONE_STATE and VIBRATE.
+
+5. In your project properties, go to __Java Build Path > Libraries__ and add all the JAR files from the project's /libs directory.
+
+6. In the __Order and Export__ tab, move the JARs to the top of the list and select all the check boxes. Make sure the order and selections match the following image:
+
+.. image:: pgasettings.png
+
+7. If you're using an emulator, configure the emulator to use the Google APIs Level 16 target or above. Also, be sure to see the Android requirements in [Adding push notifications support](adding-push-supprt.html) for steps on setting up the emulator to support push notifications.
+
+.. image:: pgaspath.png
+
+8. Run the project as an Android Application. The IDE should compile the project and install the app on your device.
+
+9. Press the button on the app to send yourself a push notification.
+
+.. image:: pgaapp.png
+
+<div class="admonition note"> <p class="first admonition-title">Note</p> <p class="last">

+For troubleshooting tips, see [Adding push notifications support](adding-push-supprt.html.
+</p></div>
+
+### More about PhoneGap
+The [PhoneGap](http://phonegap.com/) iOS push notification sample was created using standard web technologies such as HTML5, JavaScript, and CSS. You build the app with those technologies, and PhoneGap provides project templates for iOS, Android, and other platforms. For example, atop platform-specific PhoneGap code, core app code between the iOS and Android samples is essentially the same.
+
+When using PhoneGap to develop push notification apps, you use a PhoneGap plugin designed to support push notifications. That plugin is included in the Apigee samples. For more about the plugin, see the [plugin's GitHub project](https://github.com/phonegap-build/PushPlugin/blob/master/README.md).
+
+## Step 5: Review the data entities created by the sample app
+
+1. Log in to the admin portal, and select Data in the left navigation pane.
+
+2. Select any of the following collections to view the entities that were created in them by the push notification sample app:
+
+* ``/devices`` - To see the device that was added.
+
+* ``/notifications`` - To see the notification that was sent.
+
+* ``/receipts`` - To see the receipt generated from the successful push.
+
+## Step 6: Send additional push notifications using other API BaaS tools
+Send a push notification from the API BaaS Notifications console
+On the Send Notification screen. Select your notifier, select All Devices, enter a message, select Now, and click to send it.
+
+.. image:: sendnotification.png
+
+### Send a push notification directly via the push notifications API
+Use the following curl command in a terminal window, replacing your-org, your-app and notifier-name.
+
+    curl -X POST "https://api.usergrid.com/your-org/your-app/devices/*/notifications" -d '{"payloads":{"notifier-name":"I just sent another notification! Yea, me!"}}'
+    
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e5979feb/docs/push.tgz
----------------------------------------------------------------------
diff --git a/docs/push.tgz b/docs/push.tgz
new file mode 100644
index 0000000..ee85d35
Binary files /dev/null and b/docs/push.tgz differ

[45/60] [abbrv] incubator-usergrid git commit: Reorganize tags in Swagger file to align with REST Endpoint sections of the API BaaS docs.

[sn...@apache.org]

Reorganize tags in Swagger file to align with REST Endpoint sections of the API BaaS docs.

(cherry picked from commit f39505da713e7193c76fda696ca84fbae74de9d3)


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/d5b28b2e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/d5b28b2e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/d5b28b2e

Branch: refs/heads/two-dot-o-dev
Commit: d5b28b2eac66ea40a35004f8e217c7ca309edd04
Parents: d658f63
Author: Dave Johnson <sn...@apache.org>
Authored: Thu Aug 6 11:37:58 2015 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Wed Aug 12 13:02:45 2015 -0400

----------------------------------------------------------------------
 .../main/groovy/usergrid/ApiDocGenerator.groovy |   6 +-
 docs/src/main/resources/usergrid-swagger.yaml   | 818 +++++++++++--------
 2 files changed, 475 insertions(+), 349 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d5b28b2e/docs/src/main/groovy/usergrid/ApiDocGenerator.groovy
----------------------------------------------------------------------
diff --git a/docs/src/main/groovy/usergrid/ApiDocGenerator.groovy b/docs/src/main/groovy/usergrid/ApiDocGenerator.groovy
index c396a15..4952ebf 100644
--- a/docs/src/main/groovy/usergrid/ApiDocGenerator.groovy
+++ b/docs/src/main/groovy/usergrid/ApiDocGenerator.groovy
@@ -162,7 +162,7 @@ public class ApiDocGenerator {
             if (parameter.in == "body" && parameter.schema != null) {
                 param.schemaRef = parameter.schema.ref;
                 param.schemaAnchor = parameter.schema.ref.toLowerCase();
-            } else if (parameter.in == "path") {
+            } else { // if (parameter.in == "path") {
                 param.type = parameter.type;
             }
             params.add(param);
@@ -260,12 +260,12 @@ class HtmlApiDocGenerator extends ApiDocGenerator {
 
     def generateMethodsTitle(String tag) {
         writer.println "<a name='${tag}-method'></a>";
-        writer.println "<h2>${tag} Methods</h2>";
+        writer.println "<h2>${tag}</h2>";
     }
 
     def generateModelsTitle() {
         writer.println "<a name='models'></a>";
-        writer.println "<h2>Default Entity Models</h2>" +
+        writer.println "<br><h1>Default Entity Models</h1>" +
                 "<p>This section lists the properties for the following Usergrid Default Entities:</p>";
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d5b28b2e/docs/src/main/resources/usergrid-swagger.yaml
----------------------------------------------------------------------
diff --git a/docs/src/main/resources/usergrid-swagger.yaml b/docs/src/main/resources/usergrid-swagger.yaml
index b4af7c4..2755035 100644
--- a/docs/src/main/resources/usergrid-swagger.yaml
+++ b/docs/src/main/resources/usergrid-swagger.yaml
@@ -10,6 +10,95 @@ basePath: /
 produces:
   - application/json
 paths:
+
+  /management/token:
+    post:
+      summary: "Admin-User Login."
+      description: "Login with Admin-User or Organization credentials."
+      parameters:
+        - name: login-credentials
+          in: body
+          description: "Login credentials either username/password or id/secret."
+          required: true
+          schema:
+            $ref: LoginCredentials
+      tags:
+        - Access-Tokens
+      responses:
+        "200":
+          description: "Object containing access_token."
+          schema:
+            $ref: AccessTokenReponse
+        default:
+          description: "Unexpected error."
+          schema:
+            $ref: Error
+  /{orgId}/{appId}/token:
+    post:
+      summary: "App-User Login."
+      description: "Login with App-User or Application credentials."
+      parameters:
+        - name: login-credentials
+          in: body
+          description: "Login credentials either username/password or id/secret."
+          required: true
+          schema:
+            $ref: LoginCredentials
+      tags:
+        - Access-Tokens
+      responses:
+        "200":
+          description: "An array of new created Admin user's info."
+          schema:
+            $ref: AccessTokenReponse
+        default:
+          description: "Unexpected error."
+          schema:
+            $ref: Error
+#  /management/users:
+#    post:
+#      summary: ""
+#      description: ""
+#      parameters:
+#        - name: adminuserproperty
+#          in: body
+#          description: "One or more sets of user properties of which username is mandatory and must be unique."
+#          required: true
+#          schema:
+#            $ref: CreateAdminUser
+#      tags:
+#        - Access-Tokens
+#      responses:
+#        "200":
+#          description: "An array of new created Admin user's info."
+#          schema:
+#            $ref: User
+#        default:
+#          description: "Unexpected error."
+#          schema:
+#            $ref: Error
+#  /management/users:
+#    post:
+#      summary: ""
+#      description: ""
+#      parameters:
+#        - name: adminuserproperty
+#          in: body
+#          description: "One or more sets of user properties of which username is mandatory and must be unique."
+#          required: true
+#          schema:
+#            $ref: CreateAdminUser
+#      tags:
+#        - Access-Tokens
+#      responses:
+#        "200":
+#          description: "An array of new created Admin user's info."
+#          schema:
+#            $ref: User
+#        default:
+#          description: "Unexpected error."
+#          schema:
+#            $ref: Error
   /management/users:
     post:
       summary: "Creating an admin user."
@@ -22,7 +111,7 @@ paths:
           schema:
             $ref: CreateAdminUser
       tags:
-        - User
+        - Admin-Users
       responses:
         "200":
           description: "An array of new created Admin user's info."
@@ -32,6 +121,9 @@ paths:
           description: "Unexpected error."
           schema:
             $ref: Error
+            
+            
+            
   /management/users/{userId}:     
     put:
       summary: "Updating an admin user."
@@ -39,7 +131,7 @@ paths:
       parameters:
         - $ref: "#/parameters/userId"
       tags:
-        - User
+        - Admin-Users
       responses:
         "200":
           description: "An array of user's details."
@@ -55,7 +147,7 @@ paths:
       parameters:
         - $ref: "#/parameters/userId"
       tags:
-        - User
+        - Admin-Users
       responses:
         "200":
           description: "An array of user's details"
@@ -77,7 +169,7 @@ paths:
           schema: 
             $ref: ResetPWMsg
       tags:
-        - Action
+        - Admin-Users
       responses:
         "200":
           description: "An array of complete messages."
@@ -91,7 +183,7 @@ paths:
       summary: "Initiating a password reset."
       description: "Initiate the reset of an admin user's password."
       tags:
-        - Action
+        - Admin-Users
       responses:
         "200":
           description: "An array of complete messages."
@@ -114,7 +206,7 @@ paths:
           schema:
             $ref: ResetPW
       tags:
-        - Action
+        - Admin-Users
       responses:
         "200":
           description: "An array of complete messages."
@@ -141,7 +233,7 @@ paths:
           required: true
           type: boolean
       tags:
-        - Action
+        - Admin-Users
       responses:
         "200":
           description: "An array of complete messages."
@@ -158,7 +250,7 @@ paths:
       parameters:
         - $ref: "#/parameters/userId"
       tags:
-        - Action
+        - Admin-Users
       responses:
         "200":
           description: "An array of complete messages."
@@ -175,7 +267,7 @@ paths:
       parameters:
         - $ref: "#/parameters/userId"
       tags:
-        - ActivityFeed
+        - Organizations-Applications
       responses:
         "200":
           description: "An array of user's activity"
@@ -200,7 +292,7 @@ paths:
           schema:
             $ref: CreateActivity
       tags:
-        - ActivityFeed
+        - Activities
       responses:
         "200":
           description: "An array of user's activity."
@@ -225,7 +317,7 @@ paths:
           schema:
             $ref: CreateActivity
       tags:
-        - ActivityFeed
+        - Groups
       responses:
         "200":
           description:  "An array of user's activity."
@@ -247,7 +339,7 @@ paths:
           schema:
             $ref: CreateOrg
       tags:
-        - Organization
+        - Organizations-Applications
       responses:
         "200":
           description: "An array of created Organization."
@@ -264,7 +356,7 @@ paths:
       parameters:
         - $ref: "#/parameters/orgId"
       tags:
-        - Organization
+        - Organizations-Applications
       responses:
         "200":
           description: "An array of created Organization."
@@ -291,7 +383,7 @@ paths:
           required: true
           type: boolean  
       tags:
-        - Action
+        - Organizations-Applications
       responses:
         "200":
           description: "An array of complete messages."
@@ -308,7 +400,7 @@ paths:
       parameters:   
         - $ref: "#/parameters/orgId"
       tags:
-        - Action
+        - Organizations-Applications
       responses:
         "200":
           description: "An array of complete messages."
@@ -325,7 +417,7 @@ paths:
       parameters:
         - $ref: "#/parameters/orgId"
       tags:
-        - Credential
+        - Organizations-Applications
       responses:
         "200":
           description: "An array of Credential"
@@ -341,7 +433,7 @@ paths:
       parameters:
         - $ref: "#/parameters/orgId"
       tags:
-        - Credential
+        - Organizations-Applications
       responses:
         "200":
           description: "An array of Credential"
@@ -358,7 +450,7 @@ paths:
       parameters:
         - $ref: "#/parameters/orgId"
       tags:
-        - ActivityFeed
+        - Organizations-Applications
       responses:
         "200":
           description: "An array of the organization's ActivityFeed."
@@ -391,24 +483,24 @@ paths:
           description: "Unexpected error."
           schema:
             $ref: Error 
-  /management/orgs/{orgId}/apps/{appId}:
-    delete:
-      summary: "Removing an application from the organization."
-      description: "Remove an application from an organization through providing both Id of application and organization."
-      parameters:
-        - $ref: "#/parameters/orgId"
-        - $ref: "#/parameters/appId"
-      tags:
-        - AppData
-      responses:
-        "200":
-          description: "An array of deleted application info."
-          schema:
-            $ref: AppData
-        default:
-          description: "Unexpected error."
-          schema:
-            $ref: Error
+#  /management/orgs/{orgId}/apps/{appId}:
+#    delete:
+#      summary: "Removing an application from the organization."
+#      description: "Remove an application from an organization through providing both Id of application and organization."
+#      parameters:
+#        - $ref: "#/parameters/orgId"
+#        - $ref: "#/parameters/appId"
+#      tags:
+#        - Organizations-Applications
+#      responses:
+#        "200":
+#          description: "An array of deleted application info."
+#          schema:
+#            $ref: AppData
+#        default:
+#          description: "Unexpected error."
+#          schema:
+#            $ref: Error
   /management/orgs/{orgId}/apps/{appId}/credentials:
     post:
       summary: "Generating application credentials."
@@ -417,7 +509,7 @@ paths:
         - $ref: "#/parameters/orgId"
         - $ref: "#/parameters/appId"
       tags:
-        - Credential
+        - Organizations-Applications
       responses:
         "200":
           description: "An array of generated credentials info."
@@ -434,7 +526,7 @@ paths:
         - $ref: "#/parameters/orgId"
         - $ref: "#/parameters/appId"
       tags:
-        - Credential
+        - Organizations-Applications
       responses:
         "200":
           description: "An array of retrieved credentials info."
@@ -451,7 +543,7 @@ paths:
       parameters:
         - $ref: "#/parameters/orgId"
       tags:
-        - AppData
+        - Organizations-Applications
       responses:
         "200":
           description: "An array of retrieved application data."
@@ -469,7 +561,7 @@ paths:
         - $ref: "#/parameters/orgId"
         - $ref: "#/parameters/userId-2"     
       tags:
-        - User
+        - Organizations-Applications
       responses:
         "200":
           description: "An array of new added Admin user's info."
@@ -486,7 +578,7 @@ paths:
       parameters:
         - $ref: "#/parameters/orgId"
       tags:
-        - User
+        - Admin-Users
       responses:
         "200":
           description: "An array of retrieved Admin user's info."
@@ -504,7 +596,7 @@ paths:
         - $ref: "#/parameters/orgId"
         - $ref: "#/parameters/userId-2" 
       tags:
-        - User
+        - Admin-Users 
       responses:
         "200":
           description: "An array of deleted Admin user's info."
@@ -524,7 +616,7 @@ paths:
         - $ref: "#/parameters/appId"
         - $ref: "#/parameters/collectionId"
       tags:
-        - Entity
+        - Entities-Collections
       responses:
         "200":
           description: "An array of retrieved collection's info."
@@ -553,7 +645,7 @@ paths:
           schema:
             $ref: CreateEntities  
       tags:
-        - Entity
+        - Entities-Collections
       responses:
         "200":
           description: "An array of created custom entity's info."
@@ -573,7 +665,7 @@ paths:
         - $ref: "#/parameters/collectionId"
         - $ref: "#/parameters/entityId"  
       tags:
-        - Entity
+        - Entities-Collections
       responses:
         "200":
           description: "An array of retrieved entity's info."
@@ -598,7 +690,7 @@ paths:
           schema:
             $ref: CreateEntities 
       tags:
-        - Entity
+        - Entities-Collections
       responses:
         "200":
           description: "An array of updated entity's info."
@@ -617,7 +709,7 @@ paths:
         - $ref: "#/parameters/collectionId"
         - $ref: "#/parameters/entityId" 
       tags:
-        - Entity
+        - Entities-Collections
       responses:
         "200":
           description: "An array of deleted entity's info."
@@ -641,7 +733,7 @@ paths:
           required: true
           type: string
       tags:
-        - Entity
+        - Entities-Collections
       responses:
         "200":
           description: "An array of retrieved collection's info."
@@ -664,7 +756,7 @@ paths:
           required: true
           type: string
       tags:
-        - Entity
+        - Entities-Collections
       responses:
         "200":
           description: "An array of updated collection's info."
@@ -698,7 +790,7 @@ paths:
           required: true
           type: string
       tags:
-        - Entity
+        - Entities-Collections
       responses:
         "200":
           description: "An array of added entity's info."
@@ -731,7 +823,7 @@ paths:
           required: true
           type: string
       tags:
-        - Entity
+        - Entities-Collections
       responses:
         "200":
           description: "An array of deleted entity's info."
@@ -755,7 +847,7 @@ paths:
           schema:
             $ref: CreateEvent        
       tags:
-        - Event
+        - Events
       responses:
         "200":
           description: "An array of created event's info."
@@ -779,7 +871,7 @@ paths:
           schema:
             $ref: CreateGroup
       tags:
-        - Group
+        - Groups
       responses:
         "200":
           description: "An array of created group's info."
@@ -789,6 +881,7 @@ paths:
           description: "Unexpected error."
           schema:
             $ref: Error  
+            
   /{orgId}/{appId}/groups/{groupId}/users/{userId}:
     post:
       summary: "Add a user to a group."
@@ -799,7 +892,7 @@ paths:
         - $ref: "#/parameters/groupId"
         - $ref: "#/parameters/userId-3" 
       tags:
-        - User
+      - Groups
       responses:
         "200":
           description: "An array of added user's info."
@@ -818,7 +911,7 @@ paths:
         - $ref: "#/parameters/groupId"
         - $ref: "#/parameters/userId-3" 
       tags:
-        - User
+        - Groups
       responses:
         "200":
           description: "An array of deleted user's info."
@@ -837,7 +930,7 @@ paths:
         - $ref: "#/parameters/appId" 
         - $ref: "#/parameters/groupId"
       tags:
-        - Group
+        - Groups
       responses:
         "200":
           description: "An array of retrieved group's info."
@@ -855,7 +948,7 @@ paths:
         - $ref: "#/parameters/appId" 
         - $ref: "#/parameters/groupId"
       tags:
-        - Group
+        - Groups
       responses:
         "200":
           description: "An array of updated group's info."
@@ -874,7 +967,7 @@ paths:
         - $ref: "#/parameters/appId" 
         - $ref: "#/parameters/groupId" 
       tags:
-        - ActivityFeed
+        - Activities
       responses:
         "200":
           description: "An array of group's activity."
@@ -898,7 +991,7 @@ paths:
           schema:
             $ref: AddRole      
       tags:
-        - Role
+        - Permissions-Roles
       responses:
         "200":
           description: "An array of created role's info."
@@ -915,7 +1008,7 @@ paths:
         - $ref: "#/parameters/orgId"
         - $ref: "#/parameters/appId" 
       tags:
-        - Role
+        - Permissions-Roles
       responses:
         "200":
           description: "An array of retrieved role's info."
@@ -938,7 +1031,7 @@ paths:
           required: true
           type: string
       tags:
-        - Role
+        - Permissions-Roles
       responses:
         "200":
           description: "An array of deleted role's info."
@@ -963,7 +1056,7 @@ paths:
           schema:
             $ref: AddPermission
       tags:
-        - Permission
+        - Permissions-Roles
       responses:
         "200":
           description: "An array of created permission's info."
@@ -981,7 +1074,7 @@ paths:
         - $ref: "#/parameters/appId" 
         - $ref: "#/parameters/roleId"
       tags:
-        - Permission
+        - Permissions-Roles
       responses:
         "200":
           description: "An array of retrieved permission's info."
@@ -1005,7 +1098,7 @@ paths:
           required: true
           type: string
       tags:
-        - Permission
+        - Permissions-Roles
       responses:
         "200":
           description: "An array of deleted permission's info."
@@ -1025,7 +1118,7 @@ paths:
         - $ref: "#/parameters/roleId"
         - $ref: "#/parameters/userId-3"
       tags:
-        - User
+      - Permissions-Roles
       responses:
         "200":
           description: "An array of added user's info."
@@ -1044,7 +1137,7 @@ paths:
         - $ref: "#/parameters/roleId"
         - $ref: "#/parameters/userId-3" 
       tags:
-        - User
+      - Permissions-Roles
       responses:
         "200":
           description: "An array of deleted user's info."
@@ -1063,7 +1156,7 @@ paths:
         - $ref: "#/parameters/appId" 
         - $ref: "#/parameters/roleId"
       tags:
-        - User
+      - Permissions-Roles
       responses:
         "200":
           description: "An array of retrieved user's info."
@@ -1087,7 +1180,7 @@ paths:
           schema:
             $ref: CreateUser
       tags:
-        - User
+      - App-Users
       responses:
         "200":
           description: "An array of created user's info."
@@ -1109,7 +1202,7 @@ paths:
           required: true
           type: string
       tags:
-        - User
+      - App-Users
       responses:
         "200":
           description: "An array of retrieved user's info."
@@ -1138,7 +1231,7 @@ paths:
           schema:
             $ref: ResetPW    
       tags:
-        - Action
+      - App-Users
       responses:
         "200":
           description: "An array of complete messages."
@@ -1157,7 +1250,7 @@ paths:
         - $ref: "#/parameters/appId" 
         - $ref: "#/parameters/userId-2" 
       tags:
-        - User
+      - App-Users
       responses:
         "200":
           description: "An array of retrieved user's info."
@@ -1175,7 +1268,7 @@ paths:
         - $ref: "#/parameters/appId" 
         - $ref: "#/parameters/userId-3" 
       tags:
-        - User
+      - App-Users
       responses:
         "200":
           description: "An array of updated user's info."
@@ -1193,7 +1286,7 @@ paths:
         - $ref: "#/parameters/appId" 
         - $ref: "#/parameters/userId-3" 
       tags:
-        - User
+      - App-Users
       responses:
         "200":
           description: "An array of deleted user's info."
@@ -1222,7 +1315,7 @@ paths:
           required: true
           type: string
       tags:
-        - Entity
+        - Entities-Collections
       responses:
         "200":
           description: "An array of user's collections info."
@@ -1241,7 +1334,7 @@ paths:
         - $ref: "#/parameters/appId" 
         - $ref: "#/parameters/userId-3"         
       tags:
-        - ActivityFeed
+        - Activities
       responses:
         "200":
           description: "An array of user's activity feed."
@@ -1252,277 +1345,277 @@ paths:
           schema:
             $ref: Error
 
-  /{orgId}/{appId}/devices/{deviceId}/notifications:
-    post:
-      summary: "Creating notifications for a single device."
-      description: "Create notifications for a single device. This request will target a specific device entity."
-      parameters:
-        - $ref: "#/parameters/orgId"
-        - $ref: "#/parameters/appId" 
-        - $ref: "#/parameters/deviceId"
-        - $ref: "#/parameters/notification"
-        - $ref: "#/parameters/scheduleNotification" 
-        - $ref: "#/parameters/setExpiration"
-      tags:
-        - Notification
-      responses:
-        "200":
-          description: "An array of created notification's info."
-          schema:
-            $ref: Notification
-        default:
-          description: "Unexpected error."
-          schema:
-            $ref: Error
-  /{orgId}/{appId}/devices/*/notifications:
-    post:
-      summary: "Creating notifications for all devices."
-      description:  "Create notifications for all devices. This request will target all device entities."
-      parameters:
-        - $ref: "#/parameters/orgId"
-        - $ref: "#/parameters/appId" 
-        - $ref: "#/parameters/notification"
-        - $ref: "#/parameters/scheduleNotification" 
-        - $ref: "#/parameters/setExpiration"
-      tags:
-        - Notification
-      responses:
-        "200":
-          description: "An array of created notification's info."
-          schema:
-            $ref: Notification
-        default:
-          description:  "Unexpected error."
-          schema:
-            $ref: Error
-  /{orgId}/{appId}/users/{userId}/notifications:
-    post:
-      summary: "Creating notifications for a user."
-      description: "Create notifications for a user. This request will target a specific user entity."
-      parameters:
-        - $ref: "#/parameters/orgId"
-        - $ref: "#/parameters/appId" 
-        - $ref: "#/parameters/userId-3" 
-        - $ref: "#/parameters/notification"
-        - $ref: "#/parameters/scheduleNotification" 
-        - $ref: "#/parameters/setExpiration"
-      tags:
-        - Notification
-      responses:
-        "200":
-          description: "An array of created notification's info."
-          schema:
-            $ref: Notification
-        default:
-          description: "Unexpected error."
-          schema:
-            $ref: Error
-  /{orgId}/{appId}/groups/{path}/notifications:
-    post:
-      summary: "Creating notifications for a group."
-      description: "Create notifications for a group. This request will target all users associated with a specific group entity."
-      parameters:
-        - $ref: "#/parameters/orgId"
-        - $ref: "#/parameters/appId" 
-        - name: path
-          in: path
-          description:  "The path of the group."
-          required: true
-          type: string
-        - $ref: "#/parameters/notification"
-        - $ref: "#/parameters/scheduleNotification" 
-        - $ref: "#/parameters/setExpiration"
-      tags:
-        - Notification
-      responses:
-        "200":
-          description: "An array of created notification's info."
-          schema:
-            $ref: Notification
-        default:
-          description: "Unexpected error."
-          schema:
-            $ref: Error           
-  /{orgId}/{appId}/devices:
-    post:
-      summary: "Creating notifications for user through location."
-      description: "Create notifications for user through targeting by location and providing all the identifications."
-      parameters:
-        - $ref: "#/parameters/orgId"
-        - $ref: "#/parameters/appId" 
-        - $ref: "#/parameters/notification"
-        - $ref: "#/parameters/scheduleNotification" 
-        - $ref: "#/parameters/setExpiration"
-        - name: queryStatement
-          in: query
-          description: "The query statement of the location of the user."
-          required: true
-          type: string
-      tags:
-        - Notification
-      responses:
-        "200":
-          description: "An array of created notification's info."
-          schema:
-            $ref: Notification
-        default:
-          description: "Unexpected error."
-          schema:
-            $ref: Error       
-  /{orgId}/{appId}/notifications:
-    get:
-      summary: "Getting one or more notifications."
-      description: "Retrieve one or more notifications through providing all the identifications."
-      parameters:
-        - $ref: "#/parameters/orgId"
-        - $ref: "#/parameters/appId"    
-      tags:
-        - Notification
-      responses:
-        "200":
-          description: "An array of retrieved notification's info."
-          schema:
-            $ref: Notification
-        default:
-          description: "Unexpected error."
-          schema:
-            $ref: Error             
-  /{orgId}/{appId}/{receiptId}/*/notifications:
-    get:
-      summary: "Getting notifications associated with one or more receipts."
-      description: "Retrieve notifications associated with one or more receipts through providing all the identifications."
-      parameters:
-        - $ref: "#/parameters/orgId"
-        - $ref: "#/parameters/appId" 
-        - $ref: "#/parameters/receiptId" 
-      tags:
-        - Notification
-      responses:
-        "200":
-          description: "An array of retrieved notification's info."
-          schema:
-            $ref: Notification
-        default:
-          description: "Unexpected error."
-          schema:
-            $ref: Error 
-  /{orgId}/{appId}/{notificationId}/*/queue:
-    get:
-      summary: "Getting the list of devices associated with one or more notifications before the notifications are sent"
-      description: "Retrieve the list of devices associated with one or more notifications before the notifications are sent through providing all the identifications."
-      parameters:
-        - $ref: "#/parameters/orgId"
-        - $ref: "#/parameters/appId" 
-        - $ref: "#/parameters/notificationId" 
-      tags:
-        - Devices
-      responses:
-        "200":
-          description: "An array of retrieved device's info."
-          schema:
-            $ref: Device
-        default:
-          description: "Unexpected error."
-          schema:
-            $ref: Error 
-  "/my-org/sandbox/notifications/{notificationId}":
-    put:
-      summary: "Canceling sent notifications."
-      description: "Cancel sent notifications through providing the Id of the notification."
-      parameters:
-        - $ref: "#/parameters/notificationId"
-        - name: cancelMsg
-          in: body
-          description: "Indicete whether is canceled or not."
-          required: true
-          schema:
-            $ref: CancelMSG        
-      tags:
-        - Notification
-      responses:
-        "200":
-          description: "An array of canceled notification's info."
-          schema:
-            $ref: Notification
-        default:
-          description: "Unexpected error."
-          schema:
-            $ref: Error 
-  /{orgId}/{appId}/notifications/{notificationId}:
-    delete:
-      summary: "Deleting unsent notifications."
-      description: "Remove unsent notifications through providing all the identifications."
-      parameters:
-        - $ref: "#/parameters/orgId"
-        - $ref: "#/parameters/appId" 
-        - $ref: "#/parameters/notificationId"
-      tags:
-        - Notification
-      responses:
-        "200":
-          description: "An array of deleted notification's info."
-          schema:
-            $ref: Notification
-        default:
-          description: "Unexpected error."
-          schema:
-            $ref: Error  
-  /{orgId}/{appId}/receipts:
-    get:
-      summary: "Getting one or more receipts."
-      description: "Retrieve one or more receipts through providing all the identifications."
-      parameters:
-        - $ref: "#/parameters/orgId"
-        - $ref: "#/parameters/appId"        
-      tags:
-        - Receipt
-      responses:
-        "200":
-          description: "An array of retrieved receipt's info."
-          schema:
-            $ref: Receipt
-        default:
-          description: "Unexpected error."
-          schema:
-            $ref: Error 
-  /{orgId}/{appId}/{deviceId}/*/receipts:
-    get:
-      summary: "Getting receipts associated with one or more devices."
-      description: "Retrieve receipts associated with one or more devices through providing all the identifications."
-      parameters:
-        - $ref: "#/parameters/orgId"
-        - $ref: "#/parameters/appId" 
-        - $ref: "#/parameters/deviceId"
-      tags:
-        - Receipt
-      responses:
-        "200":
-          description: "An array of retrieved receipt's info."
-          schema:
-            $ref: "#/definitions/Receipt"
-        default:
-          description: "Unexpected error."
-          schema:
-            $ref: Error 
-  /{orgId}/{appId}/{notificationId}/*/receipts:
-   get:
-     summary: Get receipts for one or more notifications."
-     description: Retrieve receipts for one or more notifications through providing all the identifications."
-     parameters:
-        - $ref: "#/parameters/orgId"
-        - $ref: "#/parameters/appId" 
-        - $ref: "#/parameters/notificationId"
-     tags:
-        - Receipt
-     responses:
-        "200":
-          description: "An array of retrieved receipt's info."
-          schema:
-            $ref: "Receipt"
-        default:
-          description: "Unexpected error."
-          schema:
-            $ref: Error       
+#  /{orgId}/{appId}/devices/{deviceId}/notifications:
+#    post:
+#      summary: "Creating notifications for a single device."
+#      description: "Create notifications for a single device. This request will target a specific device entity."
+#      parameters:
+#        - $ref: "#/parameters/orgId"
+#        - $ref: "#/parameters/appId" 
+#        - $ref: "#/parameters/deviceId"
+#        - $ref: "#/parameters/notification"
+#        - $ref: "#/parameters/scheduleNotification" 
+#        - $ref: "#/parameters/setExpiration"
+#      tags:
+#        - Notifications
+#      responses:
+#        "200":
+#          description: "An array of created notification's info."
+#          schema:
+#            $ref: Notification
+#        default:
+#          description: "Unexpected error."
+#          schema:
+#            $ref: Error
+#  /{orgId}/{appId}/devices/*/notifications:
+#    post:
+#      summary: "Creating notifications for all devices."
+#      description:  "Create notifications for all devices. This request will target all device entities."
+#      parameters:
+#        - $ref: "#/parameters/orgId"
+#        - $ref: "#/parameters/appId" 
+#        - $ref: "#/parameters/notification"
+#        - $ref: "#/parameters/scheduleNotification" 
+#        - $ref: "#/parameters/setExpiration"
+#      tags:
+#        - Notifications
+#      responses:
+#        "200":
+#          description: "An array of created notification's info."
+#          schema:
+#            $ref: Notification
+#        default:
+#          description:  "Unexpected error."
+#          schema:
+#            $ref: Error
+#  /{orgId}/{appId}/users/{userId}/notifications:
+#    post:
+#      summary: "Creating notifications for a user."
+#      description: "Create notifications for a user. This request will target a specific user entity."
+#      parameters:
+#        - $ref: "#/parameters/orgId"
+#        - $ref: "#/parameters/appId" 
+#        - $ref: "#/parameters/userId-3" 
+#        - $ref: "#/parameters/notification"
+#        - $ref: "#/parameters/scheduleNotification" 
+#        - $ref: "#/parameters/setExpiration"
+#      tags:
+#        - Notifications
+#      responses:
+#        "200":
+#          description: "An array of created notification's info."
+#          schema:
+#            $ref: Notification
+#        default:
+#          description: "Unexpected error."
+#          schema:
+#            $ref: Error
+#  /{orgId}/{appId}/groups/{path}/notifications:
+#    post:
+#      summary: "Creating notifications for a group."
+#      description: "Create notifications for a group. This request will target all users associated with a specific group entity."
+#      parameters:
+#        - $ref: "#/parameters/orgId"
+#        - $ref: "#/parameters/appId" 
+#        - name: path
+#          in: path
+#          description:  "The path of the group."
+#          required: true
+#          type: string
+#        - $ref: "#/parameters/notification"
+#        - $ref: "#/parameters/scheduleNotification" 
+#        - $ref: "#/parameters/setExpiration"
+#      tags:
+#        - Notifications
+#      responses:
+#        "200":
+#          description: "An array of created notification's info."
+#          schema:
+#            $ref: Notification
+#        default:
+#          description: "Unexpected error."
+#          schema:
+#            $ref: Error           
+#  /{orgId}/{appId}/devices:
+#    post:
+#      summary: "Creating notifications for user through location."
+#      description: "Create notifications for user through targeting by location and providing all the identifications."
+#      parameters:
+#        - $ref: "#/parameters/orgId"
+#        - $ref: "#/parameters/appId" 
+#        - $ref: "#/parameters/notification"
+#        - $ref: "#/parameters/scheduleNotification" 
+#        - $ref: "#/parameters/setExpiration"
+#        - name: queryStatement
+#          in: query
+#          description: "The query statement of the location of the user."
+#          required: true
+#          type: string
+#      tags:
+#        - Notifications
+#      responses:
+#        "200":
+#          description: "An array of created notification's info."
+#          schema:
+#            $ref: Notification
+#        default:
+#          description: "Unexpected error."
+#          schema:
+#            $ref: Error       
+#  /{orgId}/{appId}/notifications:
+#    get:
+#      summary: "Getting one or more notifications."
+#      description: "Retrieve one or more notifications through providing all the identifications."
+#      parameters:
+#        - $ref: "#/parameters/orgId"
+#        - $ref: "#/parameters/appId"    
+#      tags:
+#        - Notifications
+#      responses:
+#        "200":
+#          description: "An array of retrieved notification's info."
+#          schema:
+#            $ref: Notification
+#        default:
+#          description: "Unexpected error."
+#          schema:
+#            $ref: Error             
+#  /{orgId}/{appId}/{receiptId}/*/notifications:
+#    get:
+#      summary: "Getting notifications associated with one or more receipts."
+#      description: "Retrieve notifications associated with one or more receipts through providing all the identifications."
+#      parameters:
+#        - $ref: "#/parameters/orgId"
+#        - $ref: "#/parameters/appId" 
+#        - $ref: "#/parameters/receiptId" 
+#      tags:
+#        - Notifications
+#      responses:
+#        "200":
+#          description: "An array of retrieved notification's info."
+#          schema:
+#            $ref: Notification
+#        default:
+#          description: "Unexpected error."
+#          schema:
+#            $ref: Error 
+#  /{orgId}/{appId}/{notificationId}/*/queue:
+#    get:
+#      summary: "Getting the list of devices associated with one or more notifications before the notifications are sent"
+#      description: "Retrieve the list of devices associated with one or more notifications before the notifications are sent through providing all the identifications."
+#      parameters:
+#        - $ref: "#/parameters/orgId"
+#        - $ref: "#/parameters/appId" 
+#        - $ref: "#/parameters/notificationId" 
+#      tags:
+#        - Notifications
+#      responses:
+#        "200":
+#          description: "An array of retrieved device's info."
+#          schema:
+#            $ref: Device
+#        default:
+#          description: "Unexpected error."
+#          schema:
+#            $ref: Error 
+#  "/{orgId}/{appId}/notifications/{notificationId}":
+#    put:
+#      summary: "Canceling sent notifications."
+#      description: "Cancel sent notifications through providing the Id of the notification."
+#      parameters:
+#        - $ref: "#/parameters/notificationId"
+#        - name: cancelMsg
+#          in: body
+#          description: "Indicete whether is canceled or not."
+#          required: true
+#          schema:
+#            $ref: CancelMSG        
+#      tags:
+#        - Notifications
+#      responses:
+#        "200":
+#          description: "An array of canceled notification's info."
+#          schema:
+#            $ref: Notification
+#        default:
+#          description: "Unexpected error."
+#          schema:
+#            $ref: Error 
+#  /{orgId}/{appId}/notifications/{notificationId}:
+#    delete:
+#      summary: "Deleting unsent notifications."
+#      description: "Remove unsent notifications through providing all the identifications."
+#      parameters:
+#        - $ref: "#/parameters/orgId"
+#        - $ref: "#/parameters/appId" 
+#        - $ref: "#/parameters/notificationId"
+#      tags:
+#        - Notifications
+#      responses:
+#        "200":
+#          description: "An array of deleted notification's info."
+#          schema:
+#            $ref: Notification
+#        default:
+#          description: "Unexpected error."
+#          schema:
+#            $ref: Error  
+#  /{orgId}/{appId}/receipts:
+#    get:
+#      summary: "Getting one or more receipts."
+#      description: "Retrieve one or more receipts through providing all the identifications."
+#      parameters:
+#        - $ref: "#/parameters/orgId"
+#        - $ref: "#/parameters/appId"        
+#      tags:
+#        - Notifications
+#      responses:
+#        "200":
+#          description: "An array of retrieved receipt's info."
+#          schema:
+#            $ref: Receipt
+#        default:
+#          description: "Unexpected error."
+#          schema:
+#            $ref: Error 
+#  /{orgId}/{appId}/{deviceId}/*/receipts:
+#    get:
+#      summary: "Getting receipts associated with one or more devices."
+#      description: "Retrieve receipts associated with one or more devices through providing all the identifications."
+#      parameters:
+#        - $ref: "#/parameters/orgId"
+#        - $ref: "#/parameters/appId" 
+#        - $ref: "#/parameters/deviceId"
+#      tags:
+#        - Notifications
+#      responses:
+#        "200":
+#          description: "An array of retrieved receipt's info."
+#          schema:
+#            $ref: "#/definitions/Receipt"
+#        default:
+#          description: "Unexpected error."
+#          schema:
+#            $ref: Error 
+#  /{orgId}/{appId}/{notificationId}/*/receipts:
+#   get:
+#     summary: Get receipts for one or more notifications."
+#     description: Retrieve receipts for one or more notifications through providing all the identifications."
+#     parameters:
+#        - $ref: "#/parameters/orgId"
+#        - $ref: "#/parameters/appId" 
+#        - $ref: "#/parameters/notificationId"
+#     tags:
+#        - Notifications
+#     responses:
+#        "200":
+#          description: "An array of retrieved receipt's info."
+#          schema:
+#            $ref: "Receipt"
+#        default:
+#          description: "Unexpected error."
+#          schema:
+#            $ref: Error       
 
 parameters:
   userId:
@@ -1979,6 +2072,39 @@ definitions:
         description:  "The secret of the client."
       completeMsg:
         $ref: Action
+  LoginCredentials:
+    properties:
+      grant_type:
+          type: string
+          required: true
+          description:  "Grant-type must be 'password' or 'client_credentials'."
+      username:
+          type: string
+          required: true
+          description:  "Username of user attempting login, required only if grant_type is 'password'."
+      password:
+          type: string
+          required: true
+          description:  "Password of user attempting login, required only if grant_type is 'password'."
+      client_id:
+          type: string
+          required: true
+          description:  "Client-ID portion of credentials, required only if grant_type is 'client_credentials'."
+      client_secret:
+          type: string
+          required: true
+          description:  "Client-Secret portion of credentials, required only if grant_type is 'client_credentials'."
+  AccessTokenResponse:
+    properties:
+      access_token:
+        type: string
+        description:  "Access-token that may be used on subsequent requests."
+      expires_in:
+        type: number 
+        description:  "Time (in milliseconds) until access-token expires."
+      user:
+        $ref: User
+        description: "User object if login was done as a user."
   Organization:
     properties:
       applicationId:

[36/60] [abbrv] incubator-usergrid git commit: cherry picking docs from master

[sn...@apache.org]

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/orgs-and-apps/admin-user.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/orgs-and-apps/admin-user.txt b/content/docs/_sources/orgs-and-apps/admin-user.txt
new file mode 100644
index 0000000..87b96f9
--- /dev/null
+++ b/content/docs/_sources/orgs-and-apps/admin-user.txt
@@ -0,0 +1,352 @@
+# Admin user$
+An admin user has full access to perform any operation on all organization accounts of which the admin user is a member. Using the API Services BaaS API, you can create, update, or retrieve an admin user. You can also set or reset an admin user's password, activite or reactivate an admin user, and get an admin user's activity feed.
+
+In addition, you can add,  retrieve, or remove an admin user from an organization. For information on these organization-related operations, see [Organization](organization.html).
+
+__Note__: Although not shown in the API examples below, you need to provide a valid access token with each API call. See [Authenticating users and application clients](../security_and_auth/authenticating-users-and-application-clients.html) for details.
+
+## Creating an admin user
+Use the POST method to create an admin user.
+
+### Request URI
+
+    POST /management/organizations/{org}/users {request body}
+
+In the request body send a JSON object that represents the new user, for example:
+
+    {
+      "username" : "jim.admin",
+      "email" : "jim.admin@gmail.com",
+      "name" : "Jim Admin",
+      "password" : "test12345"
+    }
+ 
+
+### Example - Request
+
+    curl -X -i POST "https://api.usergrid.com/management/organizations/my-org/users" -d '{"username":"jim.admin","name":"Jim Admin","email":"jim.admin@gmail.com","password":"test12345"}'
+
+### Example - Response
+
+    {
+      "action": "post",
+      "status": "ok",
+      "data":  {
+        "user":  {
+          "applicationId": "00000000-0000-0000-0000-000000000001",
+          "username": "jim.admin",
+          "name": "Jim Admin",
+          "email": "jim.admin@gmail.com",
+          "activated": true,
+          "disabled": false,
+          "uuid": "335b527f-cd0d-11e1-bef8-12331d1c5591",
+          "adminUser": true,
+          "displayEmailAddress": "jim.admin <ji...@gmail.com>",
+          "htmldisplayEmailAddress": "jim.admin <a href="mailto:jim.admin@gmail.com">jinm.admin@gmail.com</a>"
+        }
+      },
+      "timestamp": 1349390189106,
+      "duration": 11808
+    }
+
+
+## Updating an admin user
+Use the PUT method to update an admin user.
+
+### Request URI
+
+    PUT /management/organizations/{org}/users/{user|username|email|uuid} {request body}
+
+Parameters
+
+Parameter	    Description
+---------       ----------- 
+User identifier Username, name, email address, or UUID.
+request body	JSON object containing propties you would like to add/update on user.
+
+For example, to add city and state to user, send this:
+
+    {
+      "city" : "San Francisco",
+      "state" : "California"
+    }
+     
+### Example - Request
+
+    curl -X -i PUT "https://api.usergrid.com/management/organizations/my-org/users/jim.admin" -d '{"city":"San Francisco","state":"California"}'
+
+### Example - Response
+
+    {
+      "action": "update user info",
+      "timestamp": 1349479321874,
+      "duration": 0
+    }
+
+## Getting an admin user
+Use the GET method to retrieve details about an admin user.
+
+### Request URI
+
+    GET /management/organizations/{org}/users/{user|username|email|uuid}
+
+Parameters
+
+Parameter	        Description
+---------           -----------
+User identifier     Admin username, name, email address, or UUID.
+ 
+
+### Example - Request
+
+    curl -X GET "https://api.usergrid.com/management/organizations/my-org/users/jim.admin"
+
+### Example - Response
+
+    {
+      "action": "get admin user",
+      "status": "ok",
+      "data":  {
+        "username": "jim.admin",
+        "token": "YWMt4NqE8Q9GEeLYJhIxPSiO4AAAATo5fQfcG0cEd2h9nwmDmRorkNNrEeQyDOF",
+        "email": "edort1@gmail.com",
+        "organizations":  {
+          "jim.admin":  {
+            "users":  {
+              "jim.admin":  {
+                "applicationId": "00000000-0000-0000-0000-000000000001",
+                "username": "jim.admin",
+                "name": "Jim Admin",
+                "email": "jim.admin@gmail.com",
+                "activated": true,
+                "disabled": false,
+                "uuid": "328b526e-cd0c-11e1-bcf8-12424d1c4491",
+                "adminUser": true,
+                "displayEmailAddress": "jim.admin <ji...@gmail.com>",
+                "htmldisplayEmailAddress": "jim.admin <<a href="mailto:jim.admin@gmail.com">jim.admin@gmail.com>"
+        },
+        ...
+        "adminUser": true,
+        "activated": true,
+        "name": "edort1",
+        "applicationId": "00000000-0000-0000-0000-000000000001",
+        "uuid": "328b526e-cd0c-11e1-bcf8-12424d1c4491",
+        "htmldisplayEmailAddress": "jim.admin <<a href="mailto:jim.admin@gmail.com">jim.admin@gmail.com>>",
+        "displayEmailAddress": "jim.admin <ji...@gmail.com>",
+        "disabled": false
+      },
+      "timestamp": 1349480786906
+    }  
+
+## Setting an admin user's password
+Use the PUT method to update an admin user's password.
+
+### Request URI
+
+    PUT /management/users/{user|username|email|uuid}/password {request body}
+
+Parameters
+
+Parameter	        Description
+---------           -----------
+User identifier     Admin username, name, email address, or UUID.
+
+Expects new and old password to be sent in request body:
+
+    {
+      "password": <old_password>
+      "newpassword":<new_password>
+    }
+ 
+### Example - Request
+
+    curl -X -i PUT "https://api.usergrid.com/management/users/jim.admin/password" -d '{"oldpassword":"test123", "newpassword":"mynewpassword"}'
+
+### Example - Response
+
+    {
+      "action": "set user password",
+      "timestamp": 1349714010142,
+      "duration": 0
+    }
+
+## Resetting an admin user's password
+Resetting an admin user's password is a two step process. In the first step, you initiate the password reset. This returns a browser page. The page includes a field for the user to enter his or her email address, and a field to enter a response to a Captcha challenge. In the second step, you handle the user's responses from the form.
+
+### Initiating a password reset
+Use the GET method to initiate the password reset.
+
+### Request URI
+
+    GET /management/organizations/{org}/users/resetpw
+
+### Example - Request
+
+    curl -X GET "https://api.usergrid.com/management/organizations/my-org/users/resetpw"
+
+### Example - Response
+
+    <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+    <html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+        <title>Reset Password</title>
+        <link rel="stylesheet" type="text/css" href="../../css/styles.css" />
+        <script type="text/javascript">>
+            var RecaptchaOptions = {
+                theme : 'clean'
+            };
+        </script>
+    </head>
+    <body>
+
+        <div class="dialog-area">
+            <div class="dialog-form-message">Incorrect Captcha, try again...</div>
+            <form class="dialog-form" action="" method="post">
+                <fieldset>
+                    <p>
+                        <label for="email">Please type your <strong>email
+                                address</strong> or <strong>username</strong> below.</label>
+                    </p>
+                    <p>
+                        <input class="text_field" id="email" name="email" type="text" />
+                    </p>
+                    <p id="human-proof"></p>
+                    <script type="text/javascript" src="https://www.google.com/recaptcha/api/challenge?k=6LdSTNESAAAAAKHdVglHmMu86_EoYxsJjqQD1IpZ"></script>
+
+                    <p class="buttons">
+                        <button type="submit">Submit</button>
+                    </p>
+                </fieldset>
+            </form>
+        </div>
+    </pre>
+
+## Completing a password reset
+Use the POST method to complete the password reset.
+
+### Request URI
+
+    POST /management/organizations/{org}/users/resetpw {request body}
+
+In the request body send parameters and value for the Captcha challenge, the admin user's response to the Captcha challenge, and the admin user's email address, for example:
+
+    {
+      "recaptcha_response_field" : "Atistophanes tseFia",
+      "recaptcha_challenge_field" : "Atistophanes tseFia",
+      "email" : "jim.admin@gmail.com" 
+    }
+
+### Example - Request
+
+    curl -X -i POST "https://api.usergrid.com/management/organizations/my-org/users/resetpw" -d '{"recaptcha_response_field":"Atistophanes tseFia","recaptcha_challenge_field":"Atistophanes tseFia","email":"jim.admin@gmail.com"}'
+
+### Example - Response
+
+    {
+      "action": "reset user password",
+      "timestamp": 13546154010321,
+      "duration": 0
+    }
+
+## Activating an admin user
+Use the GET method to activate an admin user from a link provided in an email notification.
+
+### Request URI
+
+    GET /management/organizations/{org}/users/{user|username|email|uuid}/activate?token={token}&confirm={confirm_email}
+
+Parameters
+
+Parameter	        Description
+---------           -----------
+User identifier	    Admin username, name, email address, or UUID.
+string token	    Activation token (supplied via email).
+confirm_email	    Send confirmation email (false is the default).
+
+### Example - Request
+
+    curl -X GET "https://api.usergrid.com/management/organizations/my-org/users/jim.admin/activate?token=33dd0563-cd0c-11e1-bcf7-12313d1c4491"
+
+### Example - Response
+
+    {
+      "action": "activate user",
+      "timestamp": 1349718021324,
+      "duration": 0
+    }
+
+## Reactivating an admin user
+Use the GET method to reactivate an admin user.
+
+### Request URI
+
+    GET /management/organizations/{org}/users/{user|username|email|uuid}/reactivate
+
+Parameters
+
+Parameter	        Description
+---------           -----------
+User identifier	    Admin username, name, email address, or UUID.
+
+## Example - Request
+
+    curl -X GET "https://api.usergrid.com/management/organizations/my-org/users/jim.admin/reactivate"
+
+### Example - Response
+
+    {
+      "action": "reactivate user",
+      "timestamp": 1349735217217,
+      "duration": 3541
+    }
+
+## Getting an admin user's activity feed
+Use the GET method to retrieve an admin user's activity feed.
+
+### Request URI
+
+    GET /management/organizations/{org}/users/{user|username|email|uuid}/feed
+
+Parameters
+
+Parameter	        Description
+---------           -----------
+User identifier	    Admin username, name, email address, or UUID.
+
+### Example - Request
+
+    curl -X GET "https://api.usergrid.com/management/organizations/my-org/users/jim.admin/feed"
+
+### Example - Response
+
+    {
+      "action": "get admin user feed",
+      "status": "ok",
+     "entities":  [
+         {
+          "uuid": "cf3e981c-fe80-11e1-95c8-12331b144c65",
+          "type": "activity",
+          "created": 1347643370454,
+          "modified": 1347643370454,
+          "actor":  {
+            "displayName": "jim.admin",
+            "objectType": "person",
+            "uuid": "335b527f-cd0d-11e1-bef8-12331d1c5591",
+            "entityType": "user"
+          },
+          "category": "admin",
+          "metadata":  {
+            "cursor": "gGkAAQMAgGkABgE5xc3r1gCAdQAQz02YHP6QEeGVyBIxOxIsVgCAdQAQz4ZbYf6QEeGVyBIxOxIsVgA",
+            "path": "/users/327b527f-cd0c-11e1-bcf7-12313d1c4491/feed/cf4d981c-fe90-11e1-95c8-12313b122c56"
+          },
+        "object":  {
+        ...
+        },
+        "published": 1342198809251,
+                "title": "<a mailto="jim.admingmail.com">jim.admin (jim.admin@gmail.com)</a> created a new organization account named jim.admin",
+                "verb": "create"
+              }
+            ],
+      "timestamp": 1349735719320,
+    }

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/orgs-and-apps/application.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/orgs-and-apps/application.txt b/content/docs/_sources/orgs-and-apps/application.txt
new file mode 100644
index 0000000..7495aee
--- /dev/null
+++ b/content/docs/_sources/orgs-and-apps/application.txt
@@ -0,0 +1,100 @@
+# Application
+You can create a new application in an organization through the Admin portal. The Admin portal creates the new application by issuing a post against the management endpoint (see the "Creating an organization application" section in Organization for details). If you need to create an application programmatically in your app, you can also use the API to do this. You can access application entities using your app name or UUID, prefixed with the organization name or UUID:
+
+    https://api.usergrid.com/{org_name|uuid}/{app_name|uuid}
+
+Most mobile apps never access the application entity directly. For example you might have a server-side web app that accesses the application entity for configuration purposes. If you want to access your application entity programmatically, you can use the API.
+
+## Creating an application
+To create an application you POST a JSON object containing (at a minimum) the name of the new application. 
+You will also need to pass authentication credentials.
+
+### Request URI
+
+    POST /management/organizations|orgs/{org_name}|{org_uuid}/apps {request body}
+
+Parameters
+
+Parameter	    Sent in       Description
+---------       -------       ----------- 
+grant_type 	    Query string  Only the value 'client_credentials' is supported.
+client_id 	    Query string  The org-level client id for your org, found in the 'Org Administration' menu of Usergrid portal. 
+client_secret 	Query string  The org-level client secret for your org, found in the 'Org Administration' menu Usergrid portal.
+name            Request Body  The name of the application.
+
+### Example - Request
+
+    curl -X -i POST "https://api.usergrid.com/management/orgs/testorg/apps?grant_type=client_credentials&client_id=b3U68vghI6FmEeKn9wLoGtzz0A&client_secret=b3U6ZuZ5_U8Y-bOaViJt0OyRkJFES-A" -d '{"name":"testapp1"}'
+    
+### Example - Response
+
+    {
+      "action": "new application for organization",
+      "timestamp": 1338914698135,
+      "duration": 701
+    }
+
+## Generating application credentials
+Use the POST method to generate the client ID and client secret credentials for an application in an organization.
+
+### Request URI
+
+    POST /organizations|orgs/{org_name}|{uuid}/applications|apps/{app_name}|{uuid}/credentials
+
+Parameters
+
+Parameter	                Description
+---------                   ----------- 
+string org_name|arg uuid	Organization name or organization UUID.
+string app_name|arg uuid	Application name or application UUID.
+
+Note: You also need to provide a valid access token with the API call. See [Authenticating users and application clients](../security_and_auth/authenticating-users-and-application-clients.html) for details.
+
+### Example - Request
+
+    curl -X POST "https://api.usergrid.com/management/orgs/testorg/apps/testapp1/credentials"
+    
+### Example - Response
+
+    {
+      "action": "generate application client credentials",
+      "timestamp": 1349815979529,
+      "duration": 535,
+      "credentials":  {
+        "client_id": "YXA7ygil-f3TEeG-yhIxPQK1cQ",
+        "client_secret": "YXA65gYlqja8aYYSAy8Ox3Vg5aRZp48"
+      }
+    }
+
+## Getting application credentials
+Use the GET method to retrieve the client ID and client secret credentials for an application in an organization.
+
+### Request URI
+
+    GET /organizations|orgs/{org_name}|{uuid}/applications|apps/{app_name}|{uuid}/credentials
+
+Parameters
+
+Parameter	                Description
+---------                   -----------
+string org_name|arg uuid	Organization name or organization UUID.
+string app_name|arg uuid	Application name or application UUID.
+
+Note: You also need to provide a valid access token with the API call. See [Authenticating users and application clients](../security_and_auth/authenticating-users-and-application-clients.html) for details.
+
+### Example - Request
+
+    curl -X GET "https://api.usergrid.com/management/orgs/testorg/apps/testapp1/credentials"
+    
+### Example - Response
+
+    {
+      "action": "get application client credentials",
+      "timestamp": 1349816819545,
+      "duration": 7,
+      "credentials":  {
+        "client_id": "YXA7ygil-f3TEeG-yhIxPQK1cQ",
+        "client_secret": "YXA65gYlqja8aYYSAy8Ox3Vg5aRZp48"
+      }
+    }
+    

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/orgs-and-apps/managing.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/orgs-and-apps/managing.txt b/content/docs/_sources/orgs-and-apps/managing.txt
new file mode 100644
index 0000000..3c09807
--- /dev/null
+++ b/content/docs/_sources/orgs-and-apps/managing.txt
@@ -0,0 +1,50 @@
+# Organization & application management
+Your application can use the App Services API to request a variety of management operations on App Services resources. For example, your application can request an access token to use in operations on entities and collections. Or it can create an organization to contain the applications, entities, and collections for a company, team, or project.
+
+Your application makes requests through the API using HTTP methods such as GET, POST, PUT, and DELETE, and specifies the pertinent resource URL. For management operations, the URL begins with ``/management/``. See [Using the API](../getting-started/using-the-api.html) for general usage information, such as how to construct an API request.
+
+The following table lists and describes resources accessible through the App Services API on which your application can perform management operations. Click on a resource for further details about the resource and its methods.
+
+<table class="usergrid-table">
+<tr>
+  <th>
+  Resource
+  </th>
+  <th>
+  Description
+  </th>
+</tr>
+<tr>
+  <td>
+  [Access Token](../security-and-auth/authenticating-users-and-application-clients.html)
+  </td>
+  <td>
+  Carries the credentials and authorization information needed to access other resources through the Usergrid API.
+  </td>
+</tr>
+<tr>
+  <td>
+  [Client Authorization](../security-and-auth/authenticating-api-requests.html)
+  </td>
+  <td>
+  Authorizes the client.
+  </td>
+</tr>
+<tr>
+  <td>
+  [Organization](organization.html)
+  </td>
+  <td>
+  The highest level structure in the Usergrid data hierarchy.
+  </td>
+</tr>
+<tr>
+  <td>
+  [Admin User](adminuser.html)
+  </td>
+  <td>
+  A user that has full access to perform any operation on all organization accounts of which the user is a member.
+  </td>
+</tr>
+</table>
+

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/orgs-and-apps/organization.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/orgs-and-apps/organization.txt b/content/docs/_sources/orgs-and-apps/organization.txt
new file mode 100644
index 0000000..3980ae9
--- /dev/null
+++ b/content/docs/_sources/orgs-and-apps/organization.txt
@@ -0,0 +1,435 @@
+# Organization
+
+An organization represents the highest level of the API Services BaaS data hierarchy. It contains applications (and the entities and collections they contain) and is associated with one or more administrators. An organization can be representative of a company, team, or project. It allows multiple applications  to be shared within the organization with other administrators.
+
+## Creating an organization
+Use the POST method to create an organization through a form post.
+
+### Request URI
+
+    POST /organizations|orgs {request body}
+
+Parameters
+
+Expected to be sent form data in the body of the request.
+
+Parameter	           Description
+---------              ----------- 
+organization (string)  The name of the organization.
+username (string)	   The username of the administrator.
+name (string)	       The name of the administrator.
+email (string)	       The email address of the administrator.
+password (string)	   The password of the administrator.
+
+
+### Example - Request
+
+    curl -X -i POST "https://api.usergrid.com/management/orgs" -d '{"password":"test12345","email":"tester123@hotmail.com","name":"test","username":"test123","organization":"testorg"}'
+    
+### Example - Response
+
+    {
+      "action": "new organization",
+      "status": "ok",
+      "data":  {
+        "owner":  {
+          "applicationId": "00000000-0000-0000-0000-000000000001",
+          "username": "tester123",
+          "name": "test",
+          "email": "tester123@hotmail.com",
+          "activated": false,
+          "disabled": false,
+          "uuid": "48c92c73-0d7e-11e2-98b9-12313d288ee0",
+          "adminUser": true,
+          "displayEmailAddress": "tester123 <te...@hotmail.com>",
+          "htmldisplayEmailAddress": "tester123 <<a href="mailto:tester123@hotmail.com">tester123@hotmail.com</a>>"
+        },
+        "organization":  {
+          "name": "testorg",
+          "uuid": "5de0bb69-0d7f-11e2-87b9-12313d288ff0"
+        }
+      },
+      "timestamp": 1349284674173,
+      "duration": 21376
+    }
+
+## Getting an organization
+Use the GET method to retrieve an organization given a specified UUID or username.
+
+### Request URI
+
+    GET /organizations|orgs/{org_name}|{uuid}
+
+Parameters
+
+Parameter	        Description
+---------           -----------
+org_name|arg uuid	Organization name or organization UUID.
+
+Note: You also need to provide a valid access token with the API call. 
+See [Authenticating users and application clients](../security-and-auth/authenticating-users-and-application-clients.html) for details.
+
+### Example - Request
+
+    curl -X GET "https://api.usergrid.com/management/orgs/testorg"
+    
+### Example - Response
+
+    {
+      "timestamp": 1349286861746,
+      "duration": 18,
+      "organization":  {
+        "users":  {
+          "tester123":  {
+            "applicationId": "00000000-0000-0000-0000-000000000001",
+            "username": "tester123",
+            "name": "test",
+            "email": "tester123@hotmail.com",
+            "activated": true,
+            "disabled": false,
+            "uuid": "327b527f-cd0c-11e1-bcf7-12313d1c4491",
+            "adminUser": true,
+            "displayEmailAddress": "tester123 <te...@hotmail.com>",
+            "htmldisplayEmailAddress": "tester123 <<a href="mailto:tester123@hotmail.com">tester123@hotmail.com</a>>"
+          }
+        },
+        "name": "testorg",
+        "applications":  {
+          "tester123/sandbox": "3400ba10-cd0c-11e1-bcf7-12313d1c4491",
+          "tester123/testapp1": "be08a5f9-fdd3-11e1-beca-12313d027471",
+          "tester123/testapp2": "cede5b7e-fe90-11e1-95c8-12313b122c56"
+        },
+        "uuid": "33dd0563-cd0c-11e1-bcf7-12313d1c4491"
+    }
+    
+## Activating an organization
+Use the GET method to activate an organization from a link provided in an email notification.
+
+### Request URL
+
+    GET /organizations|orgs/{org_name}|{uuid}/activate?token={token}&confirm={confirm_email}
+
+Parameters
+
+Parameter	       Description
+---------          ----------- 
+org_name|arg uuid  Organization name or organization UUID.
+token	           Activation token (supplied via email).
+confirm_email	   (boolean) Send confirmation email (false is the default).
+ 
+
+### Example - Request
+
+    curl -X GET "https://api.usergrid.com/management/orgs/testorg/activate?token=33dd0563-cd0c-11e1-bcf7-12313d1c4491"
+    
+### Example - Response
+
+    {
+      "action": "activate organization",
+      "timestamp": 1337928462810,              
+      "duration": 3342
+    }
+
+## Reactivating an organization
+Use the GET method to reactivate an organization.
+
+### Request URI
+
+    GET /organizations|orgs/{org_name}|{uuid}/reactivate
+
+Parameters
+
+Parameter	                Description
+---------                   ----------- 
+string org_name|arg uuid	Organization name or organization UUID.
+ 
+
+### Example - Request
+
+    curl -X GET "https://api.usergrid.com/management/orgs/testorg/reactivate"
+    
+### Example - Response
+
+    {
+      "action": "reactivate organization",
+      "timestamp": 1349385280891,
+      "duration": 3612
+    }
+    
+## Generating organization client credentials
+Use the POST method to generate new credentials for an organization client.
+
+### Request URI
+
+    POST /organizations|orgs/{org_name}|{uuid}/credentials
+
+Parameters
+
+Parameter	                Description
+---------                   ----------- 
+string org_name|arg uuid	Organization name or organization UUID.
+
+__Note__: You also need to provide a valid access token with the API call. [Authenticating users and application clients](../security_and_auth/authenticating-users-and-application-clients.html) for details.
+
+### Example - Request
+
+    curl -X POST "https://api.usergrid.com/management/orgs/credentials"
+    
+### Example - Response
+
+    {
+      "action": "generate organization client credentials",
+      "timestamp": 1349385795647,
+      "duration": 7,
+      "credentials":  {
+        "client_id": "c2V7N61DY90MCdG78xIxPRxFdQ",                  
+        "client_secret": "c2V7WEdXIutZWEkWdySLCt_lYDFVMMN"                      
+      }
+    }
+
+## Retrieving organization client credentials
+Use the GET method to retrieve the credentials for an organization client.
+
+### Request URL
+
+    GET /organizations|orgs/{org_name}|{uuid}/credentials
+
+Parameters
+
+Parameter	                Description
+---------                   -----------
+string org_name|arg uuid	Organization name or organization UUID.
+
+__Note__: You also need to provide a valid access token with the API call. See [Authenticating users and application clients](../security_and_auth/authenticating-users-and-application-clients.html) for details.
+
+### Example - Request
+
+    curl -X GET "https://api.usergrid.com/management/orgs/testorg/credentials"
+    
+### Example - Response
+
+    {
+      "action": "get organization client credentials",
+      "timestamp": 1349386672984,
+      "duration": 690,
+      "credentials":  {
+        "client_id": "c2V7N61DY90MCdG78xIxPRxFdQ",                  
+        "client_secret": "c2V7WEdXIutZWEkWdySLCt_lYDFVMMN"                      
+      }
+    }
+
+## Getting an organization's activity feed
+Use the GET method to get an organization's activity feed.
+
+### Request URI
+
+    GET /organizations|orgs/{org_name}|{uuid}/feed
+
+Parameters
+
+Parameter	                Description
+---------                   -----------
+string org_name|arg uuid	Organization name or organization UUID.
+
+__Note__: You also need to provide a valid access token with the API call. See [Authenticating users and application clients](../security_and_auth/authenticating-users-and-application-clients.html) for details.
+
+### Example - Request
+
+    curl -X GET "https://api.usergrid.com/management/orgs/testorg/feed"
+    
+### Example - Response
+
+    {
+     {
+      "action": "get organization feed",
+      "status": "ok",
+      "entities":  [
+         {
+          "uuid": "cf4d981c-fe90-11e1-95c8-12313b122c56",
+          "type": "activity",
+          "created": 1347643370454,
+          "modified": 1347643370454,
+          "actor":  {
+            "displayName": "tester123",
+            "objectType": "person",
+            "uuid": "327b527f-cd0c-11e1-bcf7-12313d1c4491",
+            "entityType": "user"
+          },
+          "category": "admin",
+          "metadata":  {
+            "cursor": "gGkAAQMAgGkABgE5xc3r1gCAdQAQz02YHP6QEeGVyBIxOxIsVgCAdQAQz3SoH_6QEeGVyBIxOxIsVgA",
+            "path": "/groups/33dd0563-cd0c-11e1-bcf7-12313d1c4491/feed/cf4d981c-fe90-11e1-95c8-12313b122c56"
+          },
+    "object":  {
+            "displayName": "testapp2",
+            "objectType": "Application",
+            "uuid": "cede5b7e-fe90-11e1-95c8-12313b122c56",
+            "entityType": "application_info"
+          },
+          "published": 1347643370454,
+          "title": "<a mailto="mailto:tester123@hotmail.com">tester123 (tester123@hotmail.com)</a> created a new application named testapp2",
+          "verb": "create"
+        },...
+    ,
+      "timestamp": 1349387253811
+    }
+  
+## Getting the applications in an organization
+Use the GET method to retrieve the applications in an organization.
+
+### Request URI
+
+    GET /organizations|orgs/{org_name}|{uuid}/applications|apps
+
+Parameters
+
+Parameter	                Description
+---------                   ----------- 
+string org_name|arg uuid	Organization name or organization UUID.
+
+__Note__: You also need to provide a valid access token with the API call. See [Authenticating users and application clients](../security_and_auth/authenticating-users-and-application-clients.html) for details.
+
+### Example - Request
+
+    curl -X GET "https://api.usergrid.com/management/orgs/testorg/apps"
+
+### Example - Response
+
+    {
+      "action": "get organization application",
+      "data":  {
+        "testorg/sandbox": "3500ba10-cd0c-11e1-bcf8-12313d1c5591",
+        "testorg/testapp1": "be09a5f9-fdd3-11e1-beca-12313d027361",
+        "testorg/testapp2": "cede5b8e-fe90-11e1-65c8-12313b111c56"    
+      },
+      "timestamp": 1349815338635,
+      "duration": 22
+    }
+    
+## Adding an admin user to an organization
+Use the PUT method to add an existing admin user to an organization.
+
+### Request URI
+
+    PUT /organizations|orgs/{org_name}|{org_uuid}/users/{username|email|uuid}
+
+Parameters
+
+Parameter	                            Description
+---------                               -----------
+string org_name|arg org_uuid	        Organization name or organization UUID.
+string username|string email|arg uuid	User name, user email address, or user UUID.
+ 
+
+### Example - Request
+
+    curl -X PUT "https://api.usergrid.com/management/orgs/testorg/users/test123"
+
+### Example - Response
+
+    {
+      "action": "add user to organization",
+      "status": "ok",
+      "data":  {
+        "user":  {
+          "applicationId": "00000000-0000-0000-0000-000000000001",
+          "username": "tester123",
+          "name": "test",
+          "email": "tester123@hotmail.com",
+          "activated": true,
+          "disabled": false,
+          "uuid": "335b527f-cd0d-11e1-bef8-12331d1c5591",
+          "adminUser": true,
+          "displayEmailAddress": "tester123 <te...@hotmail.com>",
+          "htmldisplayEmailAddress": "tester123 <<a href="mailto:tester123@hotmail.com">tester123@hotmail.com</a>>"
+        }
+      },
+      "timestamp": 1349390189106,
+      "duration": 11808
+    }
+
+## Getting the admin users in an organization
+
+Use the GET method to retrieve details about the admin users in an organization.
+
+### Request URI
+
+    GET /organizations|orgs/{org_name}|{org_uuid}/users
+
+Parameters
+
+Parameter               Description
+---------               -----------
+org_name|arg org_uuid	Organization name or organization UUID.
+ 
+### Example - Request
+
+    curl -X GET "https://api.usergrid.com/management/orgs/testorg/users"
+
+### Example - Response
+
+    {
+      "action": "get organization users",
+      "data":  {
+        "user":  {
+          "applicationId": "00000000-0000-0000-0000-000000000001",
+          "username": "tester123",
+          "name": "test",
+          "email": "tester123@hotmail.com",
+          "activated": true,
+          "disabled": false,
+          "uuid": "335b527f-cd0d-11e1-bef8-12331d1c5591",
+          "adminUser": true,
+          "displayEmailAddress": "tester123 <te...@hotmail.com>",
+          "htmldisplayEmailAddress": "tester123 <<a href="mailto:tester123@hotmail.com">tester123@hotmail.com</a>>"
+        }
+      },
+      "timestamp": 13494542201685,
+      "duration": 10
+    }
+
+## Removing an admin user from an organization
+
+Use the DELETE method to remove an admin user from an organization. All organizations must have a minimum 
+of one user with org admin privileges. If you attempt to delete the last org admin in an organization, 
+the API will return a 400 Bad Request error.
+
+### Request URI
+
+    DELETE /organizations|orgs/{org_name}|{org_uuid}/users/{username|email|uuid}
+
+Parameters
+
+Parameter                       Description
+---------                       -----------
+org_name|arg org_uuid	        Organization name or organization UUID.
+username|string email|arg uuid	User name, user email address, or user UUID.
+ 
+### Example - Request
+
+    curl -X DELETE "https://api.usergrid.com/management/orgs/testorg/users/test123"
+
+### Example - Response
+
+    {
+      "action": "remove user from organization",
+      "status": "ok",
+      "data":  {
+        "user":  {
+          "applicationId": "00000000-0000-0000-0000-000000000001",
+          "username": "tester123",
+          "name": "test",
+          "email": "tester123@hotmail.com",
+          "activated": true,
+          "disabled": false,
+          "uuid": "335b527f-cd0d-11e1-bef8-12331d1c5591",
+          "adminUser": true,
+          "displayEmailAddress": "tester123 <te...@hotmail.com>",
+          "htmldisplayEmailAddress": "tester123 <<a href="mailto:tester123@hotmail.com">tester123@hotmail.com</a>>"
+        }
+      },
+      "timestamp": 1349453590005,
+      "duration": 727
+    }
+    
+    
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/push-notifications/tbd.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/push-notifications/tbd.txt b/content/docs/_sources/push-notifications/tbd.txt
new file mode 100644
index 0000000..1b5ca73
--- /dev/null
+++ b/content/docs/_sources/push-notifications/tbd.txt
@@ -0,0 +1 @@
+# COMING IN USERGRID 2
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/push-notifications/users-devices.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/push-notifications/users-devices.txt b/content/docs/_sources/push-notifications/users-devices.txt
new file mode 100644
index 0000000..4b1c2b6
--- /dev/null
+++ b/content/docs/_sources/push-notifications/users-devices.txt
@@ -0,0 +1,108 @@
+# Users & Devices
+
+Users and Devices are the primary ways to identify access to the system. Devices are great to track anonymous access, while Users allow you to model signing up, signing in, etc. 
+
+Users
+-----
+
+## Properties
+
+Property     Type      Description
+------------ --------- ---------------------------------------------------------------------------------
+  uuid         UUID      User’s unique entity ID
+  type         string    Type of entity, in this case “user”
+  created      long      [UNIX timestamp](http://en.wikipedia.org/wiki/Unix_time) of entity creation
+  modified     long      [UNIX timestamp](http://en.wikipedia.org/wiki/Unix_time) of entity modification
+  username     string    Valid and unique string username (mandatory)
+  password     string    User password
+  email        string    Valid and unique email address
+  name         string    User display name
+  activated    boolean   Whether the user account is activated
+  disabled     boolean   Whether the user account is administratively disabled
+  firstname    string    User first name
+  middlename   string    User middle name
+  lastname     string    User last name
+  picture      string    User picture
+
+
+## Sets
+
+  Set           Type     Description
+  ------------- -------- ---------------------------------------
+  connections   string   Set of connection types (e.g., likes)
+  rolenames     string   Set of roles assigned to a user
+  permissions   string   Set of user permissions
+  credentials   string   Set of user credentials
+
+## Relationshops
+
+  Collection   Type       Description
+  ------------ ---------- -----------------------------------------------------
+  groups       group      Collection of groups to which a user belongs
+  devices      device     Collection of devices in the service
+  activities   activity   Collection of activities a user has performed
+  feed         activity   Inbox of activity notifications a user has received
+  roles        role       Set of roles assigned to a user
+
+## Facebook Sign-in
+
+You can authenticate your Apache Usergrid requests by logging into
+Facebook. To access Apache Usergrid resources, you need to provide an
+access token with each request (unless you use the sandbox app). You can
+get an access token by connecting to an appropriate web service endpoint
+and providing the correct client credentials — this is further described
+in [Authenticating users and application
+clients](/authenticating-users-and-application-clients). However, you
+can also obtain an access token by logging into Facebook.
+
+To enable authentication to Apache Usergrid through Facebook, do the
+following in your app:
+
+1.  Make a login call to the Facebook API (do this using the [Facebook
+    SDK](https://developers.facebook.com/docs/sdks/) or
+    [API](https://developers.facebook.com/docs/facebook-login/)). If the
+    login succeeds, a Facebook access token is returned.
+2.  Send the Facebook access token to Apache Usergrid. If the Facebook
+    access token is valid and the user does not already exist in App
+    Services, Apache Usergrid provisions a new Apache Usergrid user. It also
+    returns an Apache Usergrid access token, which you can use for
+    subsequent Apache Usergrid API calls. Behind the scenes, Apache Usergrid
+    uses the Facebook access token to retrieve the user's profile
+    information from Facebook.
+
+    If the Facebook access token is invalid, Facebook returns an OAuth
+    authentication error, and the login does not succeed.
+
+The request to authenticate to Apache Usergrid using a Facebook access
+token is:
+
+    GET https://api.usergrid.com/{my_org}/{my_app}/auth/facebook?fb_access_token={fb_access_token}
+
+where:
+
+* {my\_org} is the organization UUID or organization name.\
+* {my\_app} is the application UUID or application name.\
+* {fb\_access\_token} is the Facebook access token.
+
+
+Devices
+-------
+
+## Properties
+
+Property   Type     Description
+---------- -------- ---------------------------------------------------------------------------------
+  uuid       UUID     Entity unique ID
+  type       string   Entity type (e.g., device)
+  created    long     [UNIX timestamp](http://en.wikipedia.org/wiki/Unix_time) of entity creation
+  modified   long     [UNIX timestamp](http://en.wikipedia.org/wiki/Unix_time) of entity modification
+  name       string   Device name (mandatory)
+
+
+## Relationships
+
+Devices have the following associated collection.
+
+  Collection   Type   Description
+  ------------ ------ -----------------------------------------------
+  users        user   Collection of users to which a device belongs

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/reference/contribute-code.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/reference/contribute-code.txt b/content/docs/_sources/reference/contribute-code.txt
new file mode 100644
index 0000000..5bfd0ce
--- /dev/null
+++ b/content/docs/_sources/reference/contribute-code.txt
@@ -0,0 +1,18 @@
+# How to Contribute Code & Docs
+
+Code Contributions
+---
+The Usergrid project has adopted a policy for how code is to be contributed
+by external contributors, and by those who are committers on the project. 
+You can read this policy here [Usergrid Contribution Workflow](https://cwiki.apache.org/confluence/display/usergrid/Usergrid+Contribution+Workflow).
+
+Basically, we use GitHub as our code review system. So you should fork the 
+apache/incubator-usergrid repo and submit PRs back to the project. Here 
+are are step-by-step guide for both both external contributors and committers:
+
+* [External Contributors Guide](https://cwiki.apache.org/confluence/display/usergrid/Usergrid+External+Contributors+Guide)
+* [Usergrid Committers Guide](https://cwiki.apache.org/confluence/display/usergrid/Usergrid+Committers+Guide)
+
+Website and Documentation Contributions
+---
+Documentation is in the /docs directory of our Git repo, written in Markdown format and managed by the Sphinx documentation system. See the README.md there for more information.

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/reference/presos-and-videos.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/reference/presos-and-videos.txt b/content/docs/_sources/reference/presos-and-videos.txt
new file mode 100644
index 0000000..2112d11
--- /dev/null
+++ b/content/docs/_sources/reference/presos-and-videos.txt
@@ -0,0 +1,31 @@
+# Presentations & Videos
+
+## Building Mobile Apps with Apache Usergrid
+- Screen-cast of a talk given by Dave Johnson at the All Things Open 2014, Raleigh, NC.
+
+<iframe width="560" height="315" src="https://www.youtube.com/embed/DjFG-QbxxLw" frameborder="0" allowfullscreen></iframe>
+
+## How to Contribute to Apache Usergrid
+- David Johnson at [ApacheCon NA 2014](http://apacheconnorthamerica2014.sched.org/event/29971aabd3c86398be2ae93403c7d1d2)
+
+<iframe src="http://www.slideshare.net/slideshow/embed_code/33275731" width="600" height="400" frameborder="0" marginwidth="0" marginheight="0" scrolling="no" style="border:1px solid #CCC; border-width:1px; margin-bottom:5px; max-width: 100%;" allowfullscreen> </iframe>
+
+## Apache Usergrid Internals
+- Sungju Jin
+
+<iframe src="http://speakerdeck.com/player/f0cd95108c150131a1e7669157168c6d" width="600" height="400" frameborder="0" marginwidth="0" marginheight="0" scrolling="no" style="border:1px solid #CCC; border-width:1px; margin-bottom:5px; max-width: 100%;" allowfullscreen> </iframe>
+
+## Open Source Mobile Backend on Cassandra
+- Ed Anuff
+
+<iframe src="http://www.slideshare.net/slideshow/embed_code/13919079" width="600" height="400" frameborder="0" marginwidth="0" marginheight="0" scrolling="no" style="border:1px solid #CCC; border-width:1px; margin-bottom:5px; max-width: 100%;" allowfullscreen> </iframe>
+
+## Usergrid Overview
+- Ed Anuff
+
+<iframe src="http://www.slideshare.net/slideshow/embed_code/9476483" width="600" height="400" frameborder="0" marginwidth="0" marginheight="0" scrolling="no" style="border:1px solid #CCC; border-width
+
+## Cassandra at Apigee, Usergrid Powering Mobile
+- Video of talk given by Ed Anuff at the Cassandra Summit 2012, Santa Clara, CA.
+
+<iframe width="640" height="360" src="http://www.youtube.com/embed/RuJwIBu3jvs?rel=0" frameborder="0" allowfullscreen></iframe>
\ No newline at end of file

[60/60] [abbrv] incubator-usergrid git commit: Adding Push Documentation

[sn...@apache.org]

Adding Push Documentation


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/e5979feb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/e5979feb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/e5979feb

Branch: refs/heads/two-dot-o-dev
Commit: e5979feb12476c8ab4154bda5fa09907ab098915
Parents: 6839bc5
Author: Dave Johnson <sn...@apache.org>
Authored: Wed Aug 12 13:12:29 2015 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Wed Aug 12 13:12:29 2015 -0400

----------------------------------------------------------------------
 docs/index.rst                                  |   16 +
 docs/push-notifications/adding-push-support.md  |  158 +
 docs/push-notifications/asapp.png               |  Bin 0 -> 73593 bytes
 docs/push-notifications/asemu.png               |  Bin 0 -> 34744 bytes
 docs/push-notifications/assettings.png          |  Bin 0 -> 120338 bytes
 .../creating-and-managing-notifications.md      |  269 +
 docs/push-notifications/creating-notifiers.md   |   69 +
 docs/push-notifications/gcmsetting.png          |  Bin 0 -> 101084 bytes
 docs/push-notifications/getting-started.md      |  102 +
 docs/push-notifications/googleproj0.png         |  Bin 0 -> 62311 bytes
 docs/push-notifications/ios-cert.png            |  Bin 0 -> 41925 bytes
 docs/push-notifications/iospgapp.png            |  Bin 0 -> 29796 bytes
 docs/push-notifications/iospgcert.png           |  Bin 0 -> 41925 bytes
 docs/push-notifications/iospgsettings.png       |  Bin 0 -> 384425 bytes
 docs/push-notifications/iospushauth.png         |  Bin 0 -> 42175 bytes
 docs/push-notifications/iospushfinal.png        |  Bin 0 -> 29573 bytes
 docs/push-notifications/iospushsettings.png     |  Bin 0 -> 137812 bytes
 docs/push-notifications/iphonemessage.png       |  Bin 0 -> 80970 bytes
 .../managing-users-and-devices.md               |  313 ++
 docs/push-notifications/overview.md             |   58 +
 docs/push-notifications/pgaapp.png              |  Bin 0 -> 74807 bytes
 docs/push-notifications/pgasettings.png         |  Bin 0 -> 95052 bytes
 docs/push-notifications/pgaspath.png            |  Bin 0 -> 34744 bytes
 docs/push-notifications/pushmiddleandroid0.png  |  Bin 0 -> 106080 bytes
 docs/push-notifications/pushmiddleios0.png      |  Bin 0 -> 105175 bytes
 docs/push-notifications/pushsslcertificate.png  |  Bin 0 -> 53445 bytes
 docs/push-notifications/registering.md          |  102 +
 docs/push-notifications/sendnotification.png    |  Bin 0 -> 47353 bytes
 docs/push-notifications/troubleshooting.md      |   93 +
 docs/push-notifications/tutorial.md             |  251 +
 docs/push.tgz                                   |  Bin 0 -> 1651449 bytes
 docs/rest-endpoints/api-docs.html               | 5273 ++++++++++++++++++
 32 files changed, 6704 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e5979feb/docs/index.rst
----------------------------------------------------------------------
diff --git a/docs/index.rst b/docs/index.rst
index 1afd267..0003f26 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -56,6 +56,22 @@ Apache Usergrid Documentation
    entity-connections/retrieving-entities
    entity-connections/disconnecting-entities
    
+.. _push-notifications:
+
+.. toctree::
+   :maxdepth: 2
+   :caption: Push Notifications
+   
+   push-notifications/overview
+   push-notifications/adding-push-support
+   push-notifications/getting-started
+   push-notifications/tutorial
+   push-notifications/registering
+   push-notifications/creating-notifiers
+   push-notifications/managing-users-and-devices
+   push-notifications/creating-and-managing-notifications
+   push-notifications/troubleshooting
+
 .. _security-and-authentication:
 
 .. toctree::

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e5979feb/docs/push-notifications/adding-push-support.md
----------------------------------------------------------------------
diff --git a/docs/push-notifications/adding-push-support.md b/docs/push-notifications/adding-push-support.md
new file mode 100644
index 0000000..2ec758a
--- /dev/null
+++ b/docs/push-notifications/adding-push-support.md
@@ -0,0 +1,158 @@
+# Adding push notifications support
+You add push notification support by configuring services, then adding app code to receive messages. You'll set up an account with a notification service (such as Apple's APNs or Google's GCM). Then you'll configure your App Services application to send notifications to the service. Then you'll add code to receive messages.
+
+## Setting up push notification support
+The following steps get you set up so that your app can receive push notifications. Keep in mind that these steps build on one another. In other words, you'll need values generated in step 1 in order to complete step 2, and so on.
+
+For a walkthrough of these steps using a push sample app, see [Tutorial: Push notifications sample app].
+
+1. __Register your app__ with push notification services.
+Your notification messages will be forwarded to devices by Apple and/or Google. So you'll need to register with Apple APNs and/or Google's GCM. For more information, see Registering with a notification service.
+
+2. __Create a notifier__ to send notification messages from App Services to notification services.
+App Services will use your notifier to send your messages to a notification service. For details, see Creating notifiers. To create a notifier, you'll need information generated by registering with a push notification service. You'll need a separate notifier for each app/platform combination.
+
+3. __Register devices__ at run time.
+At run time, your code will register to receive notifications. To do this, your code uses information from the notification service and App Services notifier. For more, see Managing users and devices.
+
+4. __Send and manage push notifications__
+You use App Service API notification endpoints to target devices, users, or groups with your messages. To learn more, see Creating and managing notifications.
+
+### How the pieces connect
+Click a tab below to view more information about how the pieces connect once you've got it set up.
+
+### Apple APNs
+
+The diagram below illustrates what things should look like once you've gotten set up to send notifications that are received by your app.
+
+A. At configuration time, you create an App ID, then create an App Services notifier with a .p12 certificate you generate on your Mac. The .p12 certificate correlates the notifier (which you will use to send notification messages from App Services) with the App ID (so that APNs will forward your notifications to devices).
+
+B. A run time, your app's code registers with Apple for notifications by invoking the registerForRemoteNotificationTypes method to receive a token it can send to App Services.
+
+C. At run time, your app's code registers with App Services for notifications by sending the name of the App Services notifier you created. This ensure's that there's a device entity in your App Service application. That way, you can address the device with notification messages.
+
+For information on troubleshooting push notifications on iOS devices, see Troubleshooting Push Notifications
+
+### Google GCM
+
+Google GCM
+The diagram below illustrates what things should look like once you've gotten set up to send notifications that are received by your app.
+
+A. At configuration time, you create a Google API project, then create an App Services notifier with an API key from the project. The API key correlates the notifier (which you will use to send notification messages from App Services) with the API project (which will forward your notifications to devices).
+
+B. At run time, your app's code registers with App Services for notifications by sending the name of the App Services notifier you created. This ensure's that there's a device entity in your App Service application. That way, you can address the device with notification messages.
+
+C. A run time, your app's code registers with Google for notifications by sending the number of your API project as a "sender ID". The project is the actual notification "sender" that will forward notifications to your app. In other words, the app is telling Google that it wants to receive notifications from that sender.
+
+
+
+## Requirements
+Before you start adding support for push notifications, be sure you've got the following:
+
+An Apigee account (it’s free). If you don't yet have an Apigee account, you can create one. 
+An App Services organization. Organizations are top-level containers for your APIs and other resources. By default, your Apigee account will include one organization that has the same name as your username. You can view your current organizations or create a new one by visiting your account dashboard.
+An App Services application. An App Services application is where you store you App Services data and where you schedule notifications. Data in the application represents devices, notifiers, notifications, users, and groups. For information on creating an app, see Registering apps.
+You will need to test with a mobile device running the platform you're developer for. In the case of Android, you might be able to use an emulator. It is not possible to test push notifications from a web browser.
+
+### iOS
+To develop push notifications for an iOS app, you'll need:
+
+A Mac to generate the necessary SSL certificate.
+An iOS developer account. You'll need this to register for an App ID and get a provisioning profile. To get an account, visit the iOS Dev Center.
+An actual iOS device to test push notifications. It's not yet possible to develop push notifications with an emulator.
+An iOS provisioning profile
+For iOS app testing, you need a provisioning profile that's associated with an Apple ID. You set up the provisioning profile in the Apple developer portal, download the profile, and import it into Xcode.
+
+To set up a provisioning profile, you need to create an "iOS App Development" certificate in the Apple developer portal. For example, in the Apple APNs setup earlier in this tutorial, you created a certificate in the Apple developer portal to be used for push notifications. However, you won't be able to create a provisioning portal with just that certificate. You also need to create an "iOS App Development" certificate (the configuration settings don't matter), as shown in the following image.
+
+ios dev certificate
+
+After you create an iOS App Development certificate, you can create a provisioning profile that includes your App ID/certificate for push notifications.
+
+### Android
+
+It's generally a best practice to develop Android apps by testing and debugging with an Android device. It's also possible to use an emulator.
+
+Before testing and debugging with an Android device, you'll need to set up your device for development. Be sure to see the Android documentation on using hardware devices.
+
+To test with an emulator, you will need to follow these steps:
+
+Ensure that you have Google API 8 (or above) and Android 2.2 (or above).
+Using the Android SDK Manager, install Google Cloud Messaging for Android Library.
+Using the Android Virtual Device Manager, create an emulator whose target is Google APIs.
+Ensure that the emulator you're using includes a Google account.
+Launch the emulator.
+In the emulator, click the Menu button, then go to Settings > Accounts & Sync.
+Add a Google account.
+Once you've finished these steps, you should have an emulator that can receive push notification messages.
+
+### PhoneGap
+
+You'll need to test with a device or emulator. It is not possible to test push notifications with a browser alone.
+PhoneGap Push plug-in. Developers using PhoneGap to develop their apps with HTML5 and Javascript will need to install the Apigee push notification PhoneGap plug-in to enable push notifications. Installation instructions are available in the plug-in Readme.md file, as well as in Tutorial: Push notifications sample app. The plug-in is already included in the above PhoneGap sample apps.
+
+## Tutorials
+Written tutorial
+For a full step-by-step tutorial using iOS, Android, or JavaScript, see Tutorial: Push notifications sample app.
+
+Video tutorial
+Click the tab for your preferred development platform to watch a full walkthrough video about how to integrate the App Services push notifications feature into your app.
+
+### iOS
+
+### Android
+
+## Sample Apps
+
+You'll find samples in SDKs that are specific to three mobile platforms: iOS, Android, and JavaScript. These show a simple implementation of push notifications in action. After you perform a few setup steps, running the sample app on your connected device or emulator, you will be able to send a push notification to it by clicking a button in the app's UI. You will also be able to send more pushes to it from the App Services console.
+
+To download the sample app and view the tutorial, see Tutorial: Push notifications sample app.
+
+When you create notifiers to run the samples, creating them in the default "sandbox" app in your Apigee organization will make it easier to try out the feature. The sandbox app doesn't require authentication.
+
+## Troubleshooting
+
+### Android / PhoneGap
+
+App fails to install on the emulator
+When using the emulator, be sure to note the setup steps in the requirements section.
+
+Sometimes installation fails while the emulator is still being launched. Wait until the emulator is up and running (so that you can unlock and interact with the UI), then run the project again.
+
+Make sure that the order of your Java Build Path matches the order shown in Tutorial: Push notifications sample app.
+
+#### Push errors
+If pressing the button to send yourself a push throws an exception or doesn't respond:
+
+Make sure the emulator's target matches the Google API version used in the project.
+
+In the IDE log, wait until you see that the device has been registered before sending yourself a push.
+Sometimes waiting for the code to run and trying another click gets the push message to you.
+
+If you successfully send yourself a push message once but fail to again, try one of the following:
+
+Go to the apps list on the device and launch the app from there.
+
+Uninstall the app from the device, delete the device in the App Services console, and run the project again.
+
+#### MismatchSenderId error message from the server when it tries to send a message to your app.
+
+The sender ID is a number you send to GCM from app code when registering with GCM for notifications. The error might be occurring because the sender ID with which your app is registering at GCM for notifications does not correlate to the API project whose API key was used to create your App Services notifier. First, confirm the following:
+
+* The sender ID in your app code (used when registering with GCM) is the same as your Goole API project number.
+
+* The API key used to create your App Services notifier is the same as the API key in your Google API project.
+
+* The notifier name used in your app code is the same as for the notifier you created in App Services.
+
+It can be possible to make a fix (such as by correcting the sender ID in your app code) and still see this error. If you're still seeing the error, consider create a new API project and App Services notifier, then use their new values in your code:
+
+1. Recreate (or create anew) the Google API project. This will generate a new API key and project number. See Registering with a notification service.
+
+2. Create a new App Services notifier for GCM using the API key you generated with the new API project. See Creating notifiers.
+
+3. Use the new notifier name in your code, along with a new sender ID that is that same value as the Google API project number.
+
+#### INVALID_SENDER error message
+
+The sender ID is a number you send to GCM from app code when registering with GCM for notifications. The "sender" in this case is the Google API project you created to send notification messages. Confirm that the sender ID you're using in code is the same value as the API project number generated when you created your Google API project. See Registering with a notification service.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e5979feb/docs/push-notifications/asapp.png
----------------------------------------------------------------------
diff --git a/docs/push-notifications/asapp.png b/docs/push-notifications/asapp.png
new file mode 100644
index 0000000..6a65f69
Binary files /dev/null and b/docs/push-notifications/asapp.png differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e5979feb/docs/push-notifications/asemu.png
----------------------------------------------------------------------
diff --git a/docs/push-notifications/asemu.png b/docs/push-notifications/asemu.png
new file mode 100644
index 0000000..09626df
Binary files /dev/null and b/docs/push-notifications/asemu.png differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e5979feb/docs/push-notifications/assettings.png
----------------------------------------------------------------------
diff --git a/docs/push-notifications/assettings.png b/docs/push-notifications/assettings.png
new file mode 100644
index 0000000..7812a2e
Binary files /dev/null and b/docs/push-notifications/assettings.png differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e5979feb/docs/push-notifications/creating-and-managing-notifications.md
----------------------------------------------------------------------
diff --git a/docs/push-notifications/creating-and-managing-notifications.md b/docs/push-notifications/creating-and-managing-notifications.md
new file mode 100644
index 0000000..8a98fba
--- /dev/null
+++ b/docs/push-notifications/creating-and-managing-notifications.md
@@ -0,0 +1,269 @@
+# Creating and managing notifications
+This topic provides information on setting up and sending push notifications with the Apigee API backend as a service (BaaS). For high-level information, prerequisites, and tutorials, see [Push notifications overview](overview.html).
+
+<div class="admonition note"> <p class="first admonition-title">Note</p> <p class="last">

+Although not shown in many of the API examples below, you need to provide a valid access token with each API call. See [Authenticating users and application clients](../security-and-auth/authenticating-users-and-application-clients.html) for details.
+</p></div>
+
+<div class="admonition note"> <p class="first admonition-title">Note</p> <p class="last">

+For an overview of how to set up push notifications, including troubleshooting tips, see [Adding push notifications support](adding-push-support.html).
+</p></div>
+
+## Creating notifications
+When you create a notification, it is scheduled to be delivered to all applicable devices immediately unless the deliver property has been set. A notification may contain multiple messages (payloads), and each payload must be associated with a notifier in order to deliver that message to the associated app. This allows a single notification to be delivered to multiple apps across various services, and is useful if you want to send messages to multiple notifiers, such as development and production versions of both Apple and Google simultaneously.
+
+Notification can be created via POST request to the BaaS API, or in the admin portal:
+
+### Creating notificastions with cURL
+
+#### Targeting a single device
+This request will target a specific device entity.
+
+Request Syntax
+
+    curl -X POST https://api.usergrid.com/<org>/<app>/devices/<device_ID>/notifications -d '{"payloads":{<notifier>:<message>}}'
+		
+#### Targeting all devices
+This request will target all device entities.
+
+Request Syntax
+
+    curl -X POST https://api.usergrid.com/<org>/<app>/devices/*/notifications -d '{"payloads":{<notifier>:<message>}}'
+		
+#### Targeting a single user
+This request will target a specific user entity.
+
+Request Syntax
+
+    curl -X POST https://api.usergrid.com/<org>/<app>/users/<username>/notifications -d '{"payloads":{<notifier>:<message>}}'
+		
+#### Targeting a group
+This request will target all users associated with a specific group entity.
+
+Request Syntax
+
+    curl -X POST https://api.usergrid.com/<org>/<app>/groups/<group_path>/notifications -d '{"payloads":{<notifier>:<message>}}'
+		
+#### Targeting users by location
+This request will target all device entities that are within a set radius of a latitude/longitude coordinate.
+
+Request Syntax
+
+    curl -X POST https://api.usergrid.com/<org>/<app>/devices;ql=location within <radius> of <lat>,<long>/notifications -d '{"payloads":{<notifier>:<message>}}'
+		
+#### Request Parameters
+
+The following parameters can be specified when targeting push notifications.
+
+Base URL
+
+These parameters are used in forming the base URL of the request:
+
+Parameter	Description
+---------   -----------
+org	        Organization UUID or organization name
+app	        Application UUID or application name
+
+Notification
+
+These parameters are used when forming the notification portion of the request:
+
+Parameter	Description
+---------   -----------
+notifier	The ``notifier`` entity you wish to associate with the notification (see [Creating notifiers](creating-notifiers.html) for information on creating notifiers)
+message	    The push notification message that will be delivered to the user
+
+__Note__: If your message contains double-quotes ("") you must escape them with a backslash
+
+Targets
+
+These parameters are used when specifying the notification target in the request.
+
+Parameter	                    Description
+---------                       -----------
+device	                        UUID of a device entity.
+user	                        UUID or username of a user entity.
+phone_type	                    Specified in a appended query string. The type property of a device entity.
+group	                        UUID or name of the group entity.
+latitude, longitude, radius 	Specified in a appended query string. The radius in meters of a user device from a latitude/longitude coordinate.
+
+
+### Creating notificastions with Admin portal
+
+To create the new notification with the admin portal, do the following:
+
+1. Log in to the admin portal.
+2. In the left nav, click __Push > Send Notification__.
+3. From the __Notifier__ drop-down, select the appropriate notifier.
+4. Under the notifier name, select one of the following to specify where your notification message should go:
+
+* __All Devices__ to have the message sent to all devices.
+* __Devices__ to have the message sent to a particular subset of devices. Enter a comma-separated list of device UUIDs in the box provided.
+* __Users__ to have the message sent to a particular subset of users. Enter a comma-separated list of username values in the box provided.
+* __Groups__ to have the message sent to a particular subset of user groups. Enter a comma-separated list of group paths in the box provided.
+
+5. In the __Notifier Message__ field, enter the message (payload) you want delivered.
+6. If double-quotes are included in your message, you must escape them with a backslash.
+7, Under __Delivery__, select one of the following to specify when the notification should be delivered:
+
+* __Now__ to have the message delivered immediately.
+* Schedule for later to choose a date and time at which the message should be delivered.
+
+7. Click __Submit__.
+
+To create a notification to send multiple messages or target multiple platforms, see the cURL syntax for creating notifications.
+
+### Creating notificastions with iOS
+
+To send notifications from iOS app code, you use the 11ApigeeAPSDestination11 and ``ApigeeAPSPayload`` classes.
+
+With ``ApigeeAPSDestination``, you specify where the notification should go (a particular user or device or user group, for example). With ``ApigeeAPSPayload``, you specify the contents of the message, including any alert text, sound, or badge (items specified by Apple as allowable notification content types). You then use ``ApigeeDataClient`` to send the message via Apigee and Apple APNs.
+
+The following code illustrates how to send a notification to a single user. Though this is the device on which the app itself is installed, you can imagine how you might send a notification to another device, such as one belonging to someone "following" this user. For more, see the iOS push sample application included with the [Apigee iOS SDK](../sdks/tbd.html).
+
+    - (void)sendMyselfAPushNotification:(NSString *)message
+    completionHandler:(ApigeeDataClientCompletionHandler)completionHandler
+    {
+        // send to a single device -- our own device
+        NSString *deviceId = [ApigeeDataClient getUniqueDeviceID];
+        ApigeeAPSDestination* destination =
+            [ApigeeAPSDestination destinationSingleDevice:deviceId];
+        
+        // set our APS payload
+        ApigeeAPSPayload* apsPayload = [[ApigeeAPSPayload alloc] init];
+        apsPayload.sound = kBundledSoundNameWithExt;
+        apsPayload.alertText = message;
+        
+        // Example of what a custom payload might look like -- remember that
+        // APNS payloads are limited to a maximum of 256 bytes (for the entire
+        // payload -- including the 'aps' part)
+        NSMutableDictionary* customPayload = [[NSMutableDictionary alloc] init];
+        [customPayload setValue:@"72" forKey:@"degrees"];
+        [customPayload setValue:@"3" forKey:@"newOrders"];
+        
+        __weak AppDelegate* weakSelf = self;
+        
+        // send the push notification
+        [dataClient pushAlert:apsPayload
+                customPayload:customPayload
+                  destination:destination
+                usingNotifier:notifier
+            completionHandler:^(ApigeeClientResponse *response) {
+                if ( ! [response completedSuccessfully]) {
+                    [weakSelf alert:response.rawResponse
+                              title: @"Error"];
+                }
+                
+                if (completionHandler) {
+                    completionHandler(response);
+                }
+            }];
+    }
+
+## Scheduling notifications
+
+### cURL
+
+To schedule a notification for a later time, add the deliver parameter with a UNIX timestamp to the body of your request.
+
+Request body syntax
+
+    '{"deliver":<unix_timestamp>,"payloads":{<notifier>:<message>}}'
+
+## Targeting multiple notifiers or messages
+To send multiple messages or target multiple platforms with a single notification entity, include multiple notifier-message pairs as a comma-separated list in the payloads object of the request body:
+
+Request body syntax
+
+    '{"payloads":{<notifier>:<message>, <notifier>:<message>, ...}}'
+		
+## Setting a notification expiration
+If a push service can't deliver a message to a device and needs to resend it (for example, if the device is turned off), you can set a notification to expire after a certain date/time.
+
+To do this, adding the expire parameter with a UNIX timestamp to your request body. This specifies when the service should stop trying to send the notification.
+
+<div class="admonition warning"> <p class="first admonition-title">Warning</p> <p class="last">

+Please note that if the expire property is not set and Apple APNS or Google GCM are not able to immediately deliver your push notification, delivery will not be retried. This means your notification will not be delivered. As a best practice, you should always set an expire timestamp to ensure your notification is delivered in the event the delivery initially fails.
+</p></div>
+
+Request body syntax
+
+    '{"expire":<unix_timestamp>,"payloads":{"<notifier_name>":"<message>"}}'
+
+
+## Getting notifications
+
+### cURL
+
+The following are endpoints can be used to get notifications. For details on the notification properties you can get, see Notifier, Receipt, and Notification.
+
+Getting one or more notifications:
+
+    /notifications
+    
+Getting notifications associated with one or more receipts:
+
+    /receipts/*/notification
+    
+Getting the list of devices associated with one or more notifications before the notifications are sent:
+
+    /notifications/*/queue
+    
+## Canceling sent notifications
+
+You can cancel a notification that's already in progress by doing the following:
+
+    curl -X PUT "https://api.usergrid.com/my-org/sandbox/notifications/<notification-uuid>" -d '{"canceled": true}'
+
+### Admin portal
+
+You can view JSON for notifications by viewing their entity entries in the Data section of your application.
+
+In the admin portal, click Data, then click the __/notifications__ collection.
+You can also view notification data in the message history.
+
+In the admin portal, click Push, then click Message History.
+Locate the notification for which you want to view data, then click its view details link.
+
+## Deleting unsent notifications
+
+### Deleting unsent notifications with cURL
+
+    curl -X DELETE "https://api.usergrid.com/<you-org>/<app>/notifications/<notification-uuid>"  
+
+### Deleting unsent notifications with Admin Portal
+
+1. In the admin portal, click Push, then Message History.
+2. On the Message History page, click Scheduled.
+3. In the list of scheduled messages, locate the message you want to delete.
+4. In the top area of the message item, click the delete link.
+
+## Getting receipts
+After sending a notification, the BaaS generates a receipt entity that contains details about the notification. Receipts show details such as timestamps, payloads sent, and the receipt endpoints.
+
+For information about what's contained in a receipt, see [Notifier](..//rest-endpoints/api-docs.html#notifier), [Receipt](..//rest-endpoints/api-docs.html#receipt), and [Notification](..//rest-endpoints/api-docs.html#notification). Use the following endpoints to get receipts.
+
+To get one or more receipts:
+
+    /receipts
+    
+To get receipts associated with one or more devices:
+
+    /devices/*/receipts
+    
+To get receipts for one or more notifications. For example, get receipts for notifications that had errors.
+
+    /notifications/*/receipts
+
+## Notification endpoints
+The ``/notifications`` endpoints let you create, schedule, cancel, and delete notifications. You can also use the following endpoints to accomplish the same actions for specific groups, users, devices, or any combination thereof.
+
+Base URL: ``https://api.usergrid.com/my-org/my-app``
+
+    /groups/*/notifications
+    /groups/*/users/*/notifications
+    /groups/*/users/*/devices/*/notifications
+    /users/*/notifications
+    /users/*/devices/*/notifications
+    /devices/*/notifications
+    
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e5979feb/docs/push-notifications/creating-notifiers.md
----------------------------------------------------------------------
diff --git a/docs/push-notifications/creating-notifiers.md b/docs/push-notifications/creating-notifiers.md
new file mode 100644
index 0000000..e5ae7a4
--- /dev/null
+++ b/docs/push-notifications/creating-notifiers.md
@@ -0,0 +1,69 @@
+# Creating notifiers
+When you request that a push notification be sent to your app on devices, an API BaaS notifier carries the request to the notification service (Google GCM or Apple APNs).
+
+A notifier is represented by an entity in your API BaaS application (see the [API Docs](../rest-endpoints/api-docs.html) for reference information). It carries the credentials that authorize your request. Once a notification service has verified that your notifier contains valid credentials, it will forward your push notification to your app on devices.
+
+You can create a notifier in two ways: using the admin portal and programmatically.
+
+<div class="admonition note"> <p class="first admonition-title">Note</p> <p class="last">

+For an overview of how to set up push notifications, including troubleshooting tips, see [Adding push notifications support](adding-push-support.html).
+</p></div>
+
+## Requirements
+To create a notifier, you must first register your app with the appropriate notification service, as described in [Registering with a notification service](registration.html).
+
+## Creating notifiers with the admin portal
+To create a notifier with the admin portal, do the following:
+
+1. Log in to the admin portal.
+2. In the left nav, select __Push > Configuration__.
+3. Click the __Apple__ or __Android__ tab.
+4. If you have not already done so, retrieve your .p12 certificate (iOS apps) or API key (Android apps) by following the steps in the [Registering with a notification service](registration.html).
+5. In the admin portal's Configuration page, enter values for the platform on which your mobile app will be installed.
+
+The fields are different depending on whether you are on the Apple or Android tab:
+
+__Fields for Apple__
+
+<table class="usergrid-table">
+<tr><td>Name this notifier</td>	<td>Enter a unique name that can be used to identify this notifiers.</td></tr>
+<tr><td>Certificate</td>	<td>Click __Choose File__ to select the .p12 certificate you generated and saved to your desktop earlier in this tutorial.</td></tr>
+<tr><td>Environment</td>	<td>Select the environment appropriate to your app. You may select development or production. Note that for the environment you select, you should have a separate .p12 certificate -- different certificates for development and production.</td></tr>
+<tr><td>Certificate Password</td>	
+<td>Enter a certificate password if one was specified when you created your .p12 certificate.</td></tr>
+</table>
+
+__Fields for Android__  
+
+<table class="usergrid-table">
+<tr><td>Name this notifier</td>	<td>Enter a unique name that can be used to identify this notifiers.</td></tr>
+<tr><td>API Key</td>	
+<td>Enter the API key that was generated when you registered your app with GCM. To retrieve your API key, go to the [Google API developer web site](https://code.google.com/apis/console/), then select __APIs & Auth > Credentials__.</td></tr>
+</table>
+
+6. Click __Create Notifier__. The API BaaS will create a notifier entity in the /notifiers collection. The notifier will also appear in the list of notifiers in the notifications console. 
+
+## Creating notifiers programmatically
+You can create an App BaaS notifier programmatically by sending requests to the API BaaS API.
+
+### For Apple
+
+    curl -X POST -i -H "Accept: application/json" -H "Accept-Encoding: gzip, deflate" -H "Authorization: Bearer YWMtFeeWEMyNEeKtbNX3o4PU0QAAAT8vzK3xz3utVZat0CosiYm75C2qpiGT79c" -F "name=applenotifier" -F "provider=apple" -F "environment=development" -F "p12Certificate=@/Users/me/dev/pushtest_dev.p12" 'https://api.usergrid.com/my-org/my-app/notifiers'
+
+### For Google
+
+    curl -X POST "https://api.usergrid.com/my-org/my-app/notifiers" -d '{"name":"androiddev", "provider":"google", "apiKey":"AIzaSyCkXOtBQ7A9GoJsSLqZlod_YjEfxxxxxxx"}'
+
+## Notifier endpoints
+
+The following are the available notifier endpoints. For details on notifier properties, see the [API Docs](../rest-endpoints/api-docs.html). 
+
+Base URL: ``https://api.usergrid.com/my-org/my-app/``
+
+Working with one or more notifiers:
+
+    /notifiers
+    
+Working with notifiers associated with specific devices:
+
+    /devices/{device-id}/notifier

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e5979feb/docs/push-notifications/gcmsetting.png
----------------------------------------------------------------------
diff --git a/docs/push-notifications/gcmsetting.png b/docs/push-notifications/gcmsetting.png
new file mode 100644
index 0000000..f238504
Binary files /dev/null and b/docs/push-notifications/gcmsetting.png differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e5979feb/docs/push-notifications/getting-started.md
----------------------------------------------------------------------
diff --git a/docs/push-notifications/getting-started.md b/docs/push-notifications/getting-started.md
new file mode 100644
index 0000000..04c9659
--- /dev/null
+++ b/docs/push-notifications/getting-started.md
@@ -0,0 +1,102 @@
+# Getting started with push notifications
+
+## What are push notifications?
+Apigee API BaaS provides a RESTful framework for sending push notifications to your apps, giving you full control over which app users you target, as well as when you send notifications. You can send messages to devices, users, or groups that have specific characteristics and locations. (To receive push notifications, users must be using devices that can connect to the API BaaS). Here are just a couple reasons for enabling push notification support in your app with API BaaS:
+
+* __Reach your app's users__ with messages they care about. This could be a flash sale happening near them right now (use [geolocation](../geolocation/geolocation.html)!) or a lunch special at a favorite restaurant. You could even let a user know it's her turn in a game she's playing with a friend.
+* __Keep your app footprint low__ while communicating in a high-value way with your app's users. Compare pushing data with CPU- and memory-heavy pull processes. In those, an app actively listens on an endpoint, regularly pulling data (such as news feeds, new emails, or stock market updates) to the device.
+
+<center>
+<iframe allowfullscreen="" frameborder="0" height="315" src="http://www.youtube.com/embed/W560tZ5fSIc" width="560"></iframe>
+</center>
+
+<p></p>
+
+## Prerequisites
+You will need to test with a mobile device running the platform you're developer for. In the case of Android, you might be able to use an emulator. It is not possible to test push notifications from a web browser.
+
+### iOS Prerequisites
+To develop push notifications for an iOS app, you'll need:
+
+* A Mac to generate the necessary SSL certificate.
+* An iOS developer account. You'll need this to register for an App ID and get a provisioning profile. To get an account, visit the [iOS Dev Center](https://developer.apple.com/ios/download/).
+* An actual iOS device to test push notifications. It's not yet possible to develop push notifications with an emulator.
+* An iOS provisioning profile
+For iOS app testing, you need a provisioning profile that's associated with an Apple ID. You set up the provisioning profile in the Apple developer portal, download the profile, and import it into Xcode.
+
+To set up a provisioning profile, you need to create an "iOS App Development" certificate in the Apple developer portal. For example, in the Apple APNs setup earlier in this tutorial, you created a certificate in the Apple developer portal to be used for push notifications. However, you won't be able to create a provisioning portal with just that certificate. You also need to create an "iOS App Development" certificate (the configuration settings don't matter), as shown in the following image.
+
+.. image:: ios-cert.png 
+
+After you create an iOS App Development certificate, you can create a provisioning profile that includes your App ID/certificate for push notifications.
+
+### Android Prerequisites
+
+It's generally a best practice to develop Android apps by testing and debugging with an Android device. It's also possible to use an emulator.
+
+Before testing and debugging with an Android device, you'll need to set up your device for development. Be sure to see the Android documentation on [using hardware devices](http://developer.android.com/tools/device.html).
+
+To test with an emulator, you will need to follow these steps:
+
+1. Ensure that you have Google API 8 (or above) and Android 2.2 (or above).
+2. Using the Android SDK Manager, install Google Cloud Messaging for Android Library.
+3. Using the Android Virtual Device Manager, create an emulator whose target is Google APIs.
+4. Ensure that the emulator you're using includes a Google account.
+
+Next:
+
+* Launch the emulator.
+* In the emulator, click the Menu button, then go to Settings > Accounts & Sync.
+* Add a Google account.
+* Once you've finished these steps, you should have an emulator that can receive push notification messages.
+
+### PhoneGap Prerequisites
+
+You'll need to test with a device or emulator. It is not possible to test push notifications with a browser alone.
+
+## Setup overview
+The following steps get you set up so that your app can receive push notifications. Keep in mind that these steps build on one another. In other words, you'll need values generated in step 1 in order to complete step 2, and so on.
+
+For a walkthrough of these steps using a push sample app, see Tutorial: Push notifications sample app.
+
+1. __Register__ your app with push notification services. Your notification messages will be forwarded to devices by Apple and/or Google. So you'll need to register with Apple APNs and/or Google's GCM. For more information, see Registering with a notification service.
+
+2. __Create a notifier__ to send notification messages from the API BaaS to notification services.
+The API BaaS will use your notifier to send your messages to a notification service. For details, see Creating notifiers. To create a notifier, you'll need information generated by registering with a push notification service. You'll need a separate notifier for each app/platform combination.
+
+3. __Register devices at run time__.
+At run time, your code will register to receive notifications. To do this, your code uses information from the notification service and your notifier. For more, see Managing users and devices.
+
+4. __Send and manage push notifications__.
+You use API BaaS API notification endpoints to target devices, users, or groups with your messages. To learn more, see Creating and managing notifications.
+
+
+## How it works
+Click a tab below to view more information about how the pieces connect once you've got it set up.
+
+### Apple APNs
+
+The diagram below illustrates what things should look like once you've gotten set up to send notifications that are received by your app.
+
+__A.__ At configuration time, you [create an App ID](registering.html), then [create a notifier](creating-notifiers.html) with a .p12 certificate you generate on your Mac. The .p12 certificate correlates the notifier (which you will use to send notification messages) with the App ID (so that APNs will forward your notifications to devices).
+
+__B.__ A run time, your app's code [registers with Apple for notifications](managing-users-and-devices.html) by invoking the ``registerForRemoteNotificationTypes`` method to receive a token it can send to API BaaS.
+
+__C.__ At run time, your app's code [registers with the API BaaS for notifications](managing-users-and-devices.html) by sending the name of the notifier you created. This ensure's that there's a device entity in your API BaaS application. That way, you can address the device with notification messages.
+
+.. image:: pushmiddleios0.png
+
+__Note__: For information on troubleshooting push notifications on iOS devices, see [Troubleshooting Push Notifications](troubleshooting.html)
+
+### Google GCM
+
+The diagram below illustrates what things should look like once you've gotten set up to send notifications that are received by your app.
+
+__A.__ At configuration time, you [create a Google API project](registering.html)), then [create an API BaaS notifier](creating-notifiers.html) with an API key from the project. The API key correlates the notifier (which you will use to send notification messages from the API BaaS) with the API project (which will forward your notifications to devices).
+
+__B.__ At run time, your app's code [registers with the API BaaS](managing-users-and-devices.html)) for notifications by sending the name of the notifier you created. This ensure's that there's a device entity in your API BaaS application. That way, you can address the device with notification messages.
+
+__C.__ A run time, your app's code [registers with Google for notifications](managing-users-and-devices.html)) by sending the number of your API project as a "sender ID". The project is the actual notification "sender" that will forward notifications to your app. In other words, the app is telling Google that it wants to receive notifications from that sender.
+
+.. image:: pushmiddleandroid0.png
+ 
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e5979feb/docs/push-notifications/googleproj0.png
----------------------------------------------------------------------
diff --git a/docs/push-notifications/googleproj0.png b/docs/push-notifications/googleproj0.png
new file mode 100644
index 0000000..86378b8
Binary files /dev/null and b/docs/push-notifications/googleproj0.png differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e5979feb/docs/push-notifications/ios-cert.png
----------------------------------------------------------------------
diff --git a/docs/push-notifications/ios-cert.png b/docs/push-notifications/ios-cert.png
new file mode 100644
index 0000000..9582ea7
Binary files /dev/null and b/docs/push-notifications/ios-cert.png differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e5979feb/docs/push-notifications/iospgapp.png
----------------------------------------------------------------------
diff --git a/docs/push-notifications/iospgapp.png b/docs/push-notifications/iospgapp.png
new file mode 100644
index 0000000..a393910
Binary files /dev/null and b/docs/push-notifications/iospgapp.png differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e5979feb/docs/push-notifications/iospgcert.png
----------------------------------------------------------------------
diff --git a/docs/push-notifications/iospgcert.png b/docs/push-notifications/iospgcert.png
new file mode 100644
index 0000000..9582ea7
Binary files /dev/null and b/docs/push-notifications/iospgcert.png differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e5979feb/docs/push-notifications/iospgsettings.png
----------------------------------------------------------------------
diff --git a/docs/push-notifications/iospgsettings.png b/docs/push-notifications/iospgsettings.png
new file mode 100644
index 0000000..9389bf1
Binary files /dev/null and b/docs/push-notifications/iospgsettings.png differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e5979feb/docs/push-notifications/iospushauth.png
----------------------------------------------------------------------
diff --git a/docs/push-notifications/iospushauth.png b/docs/push-notifications/iospushauth.png
new file mode 100644
index 0000000..42ab822
Binary files /dev/null and b/docs/push-notifications/iospushauth.png differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e5979feb/docs/push-notifications/iospushfinal.png
----------------------------------------------------------------------
diff --git a/docs/push-notifications/iospushfinal.png b/docs/push-notifications/iospushfinal.png
new file mode 100644
index 0000000..440461c
Binary files /dev/null and b/docs/push-notifications/iospushfinal.png differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e5979feb/docs/push-notifications/iospushsettings.png
----------------------------------------------------------------------
diff --git a/docs/push-notifications/iospushsettings.png b/docs/push-notifications/iospushsettings.png
new file mode 100644
index 0000000..44cd418
Binary files /dev/null and b/docs/push-notifications/iospushsettings.png differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e5979feb/docs/push-notifications/iphonemessage.png
----------------------------------------------------------------------
diff --git a/docs/push-notifications/iphonemessage.png b/docs/push-notifications/iphonemessage.png
new file mode 100644
index 0000000..43f7ff9
Binary files /dev/null and b/docs/push-notifications/iphonemessage.png differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e5979feb/docs/push-notifications/managing-users-and-devices.md
----------------------------------------------------------------------
diff --git a/docs/push-notifications/managing-users-and-devices.md b/docs/push-notifications/managing-users-and-devices.md
new file mode 100644
index 0000000..0e68a54
--- /dev/null
+++ b/docs/push-notifications/managing-users-and-devices.md
@@ -0,0 +1,313 @@
+# Managing users and devices
+Before your app can receive notifications on a user's device, the app's code will need to register the device with both the API BaaS and the appropriate push notification service (Apple APNs or Google GCM).
+
+By registering with the API BaaS, your app adds the device on which it is installed to your data store. The device is represented as a Device entity. This makes it possible for you to target that device when sending notifications. (For more on the Device entity, see the [API Docs](../rest-endpoints/api-docs.html).) Any devices, users, and groups that have been registered in this way may be targeted with push notifications.
+
+By registering with the notification service, you make the device known to the service. This way, the service can forward your notifications to the device.
+
+<div class="admonition note"> <p class="first admonition-title">Note</p> <p class="last">

+For an overview of how to set up push notifications, including troubleshooting tips, see [Adding push notifications support](adding-push-support.html).
+</p></div>
+
+## Registering devices
+The following samples illustrate how to register a device with a notification service and with the API BaaS. At a high level, your code will send a registration request to the notification service, then use information in the service's response to send a separate request to the API BaaS. The two requests correlate the notification service, API BaaS, and your mobile app.
+
+You can also create device entities separately by using the /devices endpoint. For more information on using the ``/devices`` endpoint in the API BaaS, see the [API Docs](../rest-endpoints/api-docs.html).
+
+Registering a device with a notification service is a standard coding activity for implementing push notifications. This is not specific to the API BaaS.
+
+
+### Registering for iOS
+
+The following code illustrates how you can use the iOS SDK to register a device with both the Apigee server and with the APNs, the Apple push notification service. This example assumes that your code has already property initialized the SDK. For more information, see [Installing the Apigee SDK for iOS](../sdks/tbd.html).
+
+    // Register with Apple to receive notifications.
+
+    // Invoked when the application moves from an inactive to active state. Use this
+    // method to register with Apple for notifications.
+    - (void)applicationDidBecomeActive:(UIApplication *)application
+    {
+        // Find out what notification types the user has enabled.
+        UIRemoteNotificationType enabledTypes =
+            [application enabledRemoteNotificationTypes];
+
+        // If the user has enabled alert or sound notifications, then
+        // register for those notification types from Apple.
+        if (enabledTypes & (UIRemoteNotificationTypeAlert|UIRemoteNotificationTypeSound)) {
+            
+            // Register for push notifications with Apple
+            NSLog(@"registering for remote notifications");
+            [application registerForRemoteNotificationTypes:UIRemoteNotificationTypeAlert |
+             UIRemoteNotificationTypeSound];
+        }
+    }
+
+    // Invoked as a callback from calling registerForRemoteNotificationTypes. 
+    // newDeviceToken is a token received from registering with Apple APNs.
+    // Use this method to register with Apigee.
+    - (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)newDeviceToken
+    {
+        // Register device token with the API BaaS (will create the Device entity if it doesn't exist)
+        // Sends the name of the notifier you created with Apigee, along with the token your code
+        // received from Apple.
+        ApigeeClientResponse *response = [dataClient setDevicePushToken: newDeviceToken
+                                                            forNotifier: notifier];
+        
+        if ( ! [response completedSuccessfully]) {
+            [self alert: response.rawResponse title: @"Error"];
+        }
+    }
+
+    // Invoked as a callback from calling registerForRemoteNotificationTypes if registration 
+    // failed.
+    - (void)application:(UIApplication*)application didFailToRegisterForRemoteNotificationsWithError:(NSError*)error
+    {
+        [self alert: error.localizedDescription title: @"Error"];
+    }
+
+Initialize the Apigee client and check for notifications that might have been sent while the app was off.
+
+    // Invoked as a callback after the application launches.
+    - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
+    {
+        // Connect and login
+        ApigeeClient *apigeeClient =
+            [[ApigeeClient alloc] initWithOrganizationId:orgName
+                                           applicationId:appName
+                                                 baseURL:baseURL];
+        dataClient = [apigeeClient dataClient];
+        [dataClient setLogging:true]; //comment out to remove debug output from the console window
+
+        // Find out if there's a notification waiting to be handled after the
+        // app launches.
+        if (launchOptions != nil) {
+            NSDictionary* userInfo =
+                [launchOptions objectForKey:UIApplicationLaunchOptionsRemoteNotificationKey];
+            
+            // If there's notification data waiting, send it to be processed.
+            if (userInfo) {
+                [self handlePushNotification:userInfo
+                              forApplication:application];
+            }
+        }
+        
+        // It's not necessary to explicitly login if the Guest role allows access.
+        // But this is how you can do it.
+    //    [apigeeClient logInUser: userName password: password];
+
+        NSLog(@"done launching");
+        return YES;
+    }
+
+### Registering for Android
+
+The following code illustrates how to register a client device with GCM, register the device with Apigee, and associate the device with the user. Methods used in this code are defined in the Apigee Android SDK. For more information on downloading and installing the SDK, see Installing the Apigee SDK for Android.
+
+    import android.content.Context;
+    import com.google.android.gcm.GCMRegistrar;
+    import com.apigee.sdk.ApigeeClient;
+    import com.apigee.sdk.data.client.entities.Device;
+
+    /**
+     * Registers this device with GCM, Google's messaging 
+     * service.
+     *
+     * @param context An Android context with information specific to this 
+     * application's context on the device.
+     */
+    static void registerPush(Context context) {
+        
+        //Get an instance of the Apigee DataClient class from the ApigeeClient object
+        dataClient = getClient().getDataClient();
+        
+        // Get the registration ID (GCM API key) for this application.
+        final String regId = GCMRegistrar.getRegistrationId(context);
+
+        // If this device isn't already registered with GCM, register it
+        // using the the application context and an ID for the Google account
+        // authorized to send messages to this application. This is the 
+        // Google Client ID from Google API Console.
+        if ("".equals(regId)) {
+          GCMRegistrar.register(context, gcmSenderId);
+        } else {
+            if (GCMRegistrar.isRegisteredOnServer(context)) {
+                Log.i(TAG, "Already registered with GCM");
+            } else {
+            
+            // Use an instance of the Client class (SDK for Android) 
+            // to register this device with the API BaaS. Pass as arguments
+            // the device unique identifier, the unique name of the notifier you
+            // created in the API BaaS, the GCM API key, and a callback that will
+            // receive an instance of a Device class representing the registered
+            // device on the system.
+            dataClient.registerDeviceForPushAsync(dataClient.getUniqueDeviceID(), notifierName, regId, null, 
+                new DeviceRegistrationCallback() {        
+                    @Override
+                    public void onResponse(Device device) {                
+                        AppServices.device = device;
+
+                        // Associate the logged in user with this device.
+                        if (dataClient.getLoggedInUser() != null) {
+                            dataClient.connectEntitiesAsync("users", 
+                                dataClient.getLoggedInUser().getUuid().toString(),
+                                "devices", device.getUuid().toString(),
+                                new ApiResponseCallback() {
+                                    @Override
+                                    public void onResponse(ApiResponse apiResponse) {
+                                      Log.i(TAG, "connect response: " + apiResponse);
+                                    }
+                        
+                                    @Override
+                                    public void onException(Exception e) {
+                                      displayMessage(context, "Connect Exception: " + e);
+                                      Log.i(TAG, "connect exception: " + e);
+                                    }
+                            });
+                        }
+                    }
+            
+                });
+            }
+        }
+    }
+
+    /**
+     * Create an instance of the SDK ApigeeClient class, setting
+     * values from your Apigee registration.
+     */
+    static synchronized ApigeeClient getClient() {
+        if (client == null) {
+            client = new ApigeeClient();
+            client.setApiUrl("https://api.usergrid.com");
+            client.setOrganizationId("your-org");
+            client.setApplicationId("your-app");
+        }
+        return client;
+    }
+
+
+### Registering for HTML5/PhoneGap
+
+The following code illustrates how you can use the JavaScript functions included with the PhoneGap plugin to register a device with both the Apigee server and with the APNs, the Apple push notification service.
+
+    // Declare a variable for calling push notification APIs.
+    var pushNotification = window.plugins.pushNotification;
+    // Collect configuration options to specify that this device accepts
+    // an alert message, an application badge, and a sound.
+    var appleOptions = {
+        alert:true, badge:true, sound:true
+    };
+    // Register the device with the API BaaS, passing options for configuration 
+    // along with a callback from which you can retrieve the device token
+    // sent by Apigee.
+    pushNotification.registerDevice(appleOptions, function(status) {
+        console.log(status);
+        // If a token was received, bundle options to pass when registering the device 
+        // with the push notification service. The provider value must be "apigee" to
+        // support push notification through Apigee. orgName and appName should be 
+        // values corresponding to those used in your Apigee account.
+        // notifier is the unique name you associated with the Apigee notifier you created.
+        // token is the device token this code received from Apigee after registering the 
+        // device.
+        if(status.deviceToken) {
+            var options = {
+                "provider":"apigee",
+                "orgName":"YOUR APIGEE.COM USERNAME",
+                "appName":"sandbox",
+                "notifier":"YOUR NOTIFIER",
+                "token":status.deviceToken
+            };
+
+            // Use the device token and other options to register this device with the 
+            // push notification provider.
+            pushNotification.registerWithPushProvider(options, function(status){
+                console.log(status);
+            });
+        }
+    });
+    
+The functions used in this code are defined in the PhoneGap plugin. JavaScript functions invoke underlying Objective-C or Java code (depending on platform). You'll find that code in these files, included in the Apigee PhoneGap push notification plug-in.
+
+Information about installing the plugin is available in its Readme file. For more complete examples, see [Tutorial: Push notifications sample app](tutorial.html).
+
+
+## Connecting devices to users
+You can associate user entities with device entities in the API BaaS. Doing so allows you to target your push notifications at users with specific characteristics. The following describes how to connect a user to a specific device in the API BaaS.
+
+For more information on creating a device in your API BaaS data store, see "Registering Devices" above.
+
+For more information on creating a user in your API BaaS data store, see [User](../rest-endpoints/api-docs.html#user).
+
+The following code examples all use the same basic endpoint pattern for connecting devices with users:
+
+    POST /users/{userUUID or name}/devices/{deviceUUID}
+    
+### Connecting with curl
+The following call connects user "joex" with device 7a0a1cba-9a18-3bee-8ae3-4f511f12a386 (the device UUID). After this connection, you can send a push notification to joex rather than the device. Further, if joex has specific properties set--such as {"favoritecolor": "blue"}--you can send a push notification to all users whose favorite color is blue (assuming they're connected to devices in the API BaaS).
+
+    curl -X POST "https://api.usergrid.com/my-org/sandbox/users/joex/devices/7a0a1cba-9a18-3bee-8ae3-4f511f12a386"
+
+### Connecting with iOS
+
+The following sample code, taken from AppDelegate.m in the native iOS push sample, uses the connectEntities method from the iOS SDK to connect a device to a user.
+
+    ApigeeClientResponse *response = [dataClient setDevicePushToken: newDeviceToken forNotifier: notifier];
+
+    // You could use this if you log in as an API BaaS user to associate the Device to your User
+    if (response.transactionState == kUGClientResponseSuccess) {
+        response = [self connectEntities: @"users" connectorID: @"me" type: @"devices" connecteeID: deviceId];
+    }
+
+### Connecting with Android
+
+The following sample code, taken from [AppServices.java](https://github.com/apigee/appservices-android-push-example/blob/master/src/com/ganyo/pushtest/AppServices.java) in the native Android push sample, uses the connectEntitiesAsync method from the Android SDK to connect a device to an authenticated user.
+
+    // connect Device to current User - if there is one
+    if (dataClient.getLoggedInUser() != null) {
+      dataClient.connectEntitiesAsync("users", dataClient.getLoggedInUser().getUuid().toString(),
+                                       "devices", device.getUuid().toString(),
+                                       new ApiResponseCallback() {...
+                                       
+### Connecting with HTML5/JavaScript
+
+The following code illlustrates how to associate the currently logged in user with their device.
+
+    // You'll need a client from the JavaScript SDK.
+    var client = new Apigee.Client({
+        // Initialize client.
+    });
+
+    // Get information about the current user so you can use
+    // it to connect them with their device.
+    client.getLoggedInUser(function(err, data, user) {
+        if(err) {
+            // Could not get the logged in user.
+        } else {
+            if (client.isLoggedIn()) {
+                // Using a PushNotification function to get the device ID as
+                // it is known to the Apigee system.
+                pushNotification.getApigeeDeviceId(function(results) {
+                    if (results.deviceId) {
+                        // Use the JavaScript SDK connect function to register
+                        // a connection between the current user and their device.
+                        user.connect('devices', results.deviceId, function (err, data) {
+                            if (err) {
+                                // Could not make the connection.
+                            } else {
+                                // Call succeeded, so pull the connections back down.
+                                user.getConnections('devices', function (err, data) {
+                                if (err) {
+                                    // Couldn't get the connections.
+                                } else {
+                                    // Connection exists.
+                                });
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+You can also connect users with groups so that you can send push notifications to groups of users (and their associated devices), see [Working with group data](../user-management/group.html).
+

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e5979feb/docs/push-notifications/overview.md
----------------------------------------------------------------------
diff --git a/docs/push-notifications/overview.md b/docs/push-notifications/overview.md
new file mode 100644
index 0000000..4731b60
--- /dev/null
+++ b/docs/push-notifications/overview.md
@@ -0,0 +1,58 @@
+# Push notifications overview
+
+<table style="border: solid 1px grey">
+<tr>
+<td width="40%" style="padding:1em">
+
+.. image:: iphonemessage.png 
+
+</td>
+<td>
+
+## Reach your users with push
+With the new push notifications feature in the Apigee API BaaS, you can send announcements to your app's users.
+
+* __Reach your app's users__ with messages they care about.
+* __Keep your app footprint low__ while communicating in a high-value way with your app's users. 
+
+[Read more](getting-started.html)
+
+</td>
+</tr>
+</table>
+
+<p></p>
+
+## Get started
+
+#### [Get started with a tutorial](tutorial.html)
+Build your first push-enabled app using an Apigee sample.
+
+#### [Find what you can do with it](getting-started.html)
+A video and introduction.
+
+#### [See the prerequisites](getting-started.html#prerequisites)
+Depending on your supported app platforms, you'll need just a few things.
+
+ 
+## Build push support
+
+#### [Setting up push notifications support](getting-started.html)
+Connect Apple or Google with Apigee and your app.
+
+#### [Register your app](registering.html)
+Register with Apple or Google.
+
+#### [Create a notifier](creating-notifiers.html)
+Your application uses this to send messages.
+
+#### [Register client devices](managing-users-and-devices.html)
+Your app code registers to receive notifications.
+
+#### [Send and manage notifications](creating-and-managing-notifications.html)
+You can do this from app code or the admin portal.
+
+## Learn more
+
+#### [Troubleshoot your push support](troubleshooting.html)
+Things don't work as you expect?
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e5979feb/docs/push-notifications/pgaapp.png
----------------------------------------------------------------------
diff --git a/docs/push-notifications/pgaapp.png b/docs/push-notifications/pgaapp.png
new file mode 100644
index 0000000..09e1cad
Binary files /dev/null and b/docs/push-notifications/pgaapp.png differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e5979feb/docs/push-notifications/pgasettings.png
----------------------------------------------------------------------
diff --git a/docs/push-notifications/pgasettings.png b/docs/push-notifications/pgasettings.png
new file mode 100644
index 0000000..aa6f2df
Binary files /dev/null and b/docs/push-notifications/pgasettings.png differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e5979feb/docs/push-notifications/pgaspath.png
----------------------------------------------------------------------
diff --git a/docs/push-notifications/pgaspath.png b/docs/push-notifications/pgaspath.png
new file mode 100644
index 0000000..09626df
Binary files /dev/null and b/docs/push-notifications/pgaspath.png differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e5979feb/docs/push-notifications/pushmiddleandroid0.png
----------------------------------------------------------------------
diff --git a/docs/push-notifications/pushmiddleandroid0.png b/docs/push-notifications/pushmiddleandroid0.png
new file mode 100644
index 0000000..1afd954
Binary files /dev/null and b/docs/push-notifications/pushmiddleandroid0.png differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e5979feb/docs/push-notifications/pushmiddleios0.png
----------------------------------------------------------------------
diff --git a/docs/push-notifications/pushmiddleios0.png b/docs/push-notifications/pushmiddleios0.png
new file mode 100644
index 0000000..1ba14f1
Binary files /dev/null and b/docs/push-notifications/pushmiddleios0.png differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e5979feb/docs/push-notifications/pushsslcertificate.png
----------------------------------------------------------------------
diff --git a/docs/push-notifications/pushsslcertificate.png b/docs/push-notifications/pushsslcertificate.png
new file mode 100644
index 0000000..bab137d
Binary files /dev/null and b/docs/push-notifications/pushsslcertificate.png differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e5979feb/docs/push-notifications/registering.md
----------------------------------------------------------------------
diff --git a/docs/push-notifications/registering.md b/docs/push-notifications/registering.md
new file mode 100644
index 0000000..e7d76e5
--- /dev/null
+++ b/docs/push-notifications/registering.md
@@ -0,0 +1,102 @@
+# Registering with a notification service
+To send push notifications, you will need to first register your app with the push notification service (Apple APNs or Google GCM) that corresponds to your app's platform. Once you've registered, the service will provide you with a certificate or key that you will need when you create an API BaaS notifier. (See [Creating notifiers](creating-notifiers.html) for more information.)
+
+Push notification services are gateways controlled by platform services (such as Apple and Google). These gateways ensure that push notifications are delivered securely and originate from trusted apps.
+
+To send push notifications to your app on iOS devices, you’ll register the the Apple Push Notification service (APNs). For app on Android, you’ll register with Google Cloud Messaging for Android (GCM).
+
+<div class="admonition note"> <p class="first admonition-title">Note</p> <p class="last">

+For an overview of how to set up push notifications, see [Setting up push notification support](adding-push-support.html).
+</p></div>
+
+## Registering with Apple APNs
+Before you can send push notifications to your app on iOS devices, you'll need to get set up so that Apple knows you'll be sending notifications. To do that, you'll need to do the following:
+
+* Generate an SSL signing certificate you can use to generate a .p12 certificate.
+* Create an Apple App ID through which you can associate push notifications support with your app.
+* Generate a .p12 certificate you can use to create an API BaaS notifier. The certificate will be sent to APNs with push notification requests.
+
+For more information see "How the pieces connect" in [Setting up push notification support](getting-started.html).
+
+<div class="admonition note"> <p class="first admonition-title">Note</p> <p class="last">

+You'll need a Mac to generate a .p12 certificate and work with APNs.
+</p></div>
+
+### Generating an SSL signing certificate
+First, you'll create an SSL signing certificate that you can use to generate a .p12 certificate. To generate an SSL signing certificate, do the following:
+
+1. On your development machine, launch the Keychain Access application.
+2. From the Keychain Access menu, select __Certificate Assistant > Request a Certificate From a Certificate Authority__.
+3. Enter a contact email address and a name you will use to sign your apps.
+4. Select __Saved to disk__, then click __Continue__.
+5. Select __Desktop__ from the Where drop-down, then click __Save__ to download the .certSigningRequest file.
+6. Click __Done__ once the download has completed.
+
+### Creating an App ID
+
+Next, you must create an App ID for your app. The App ID uniquely identifies your app and provides a way for you to configure the app for push notification support. (For more on App IDs, see [Creating and Configuring App IDs](https://developer.apple.com/library/ios/documentation/IDEs/Conceptual/AppDistributionGuide/MaintainingProfiles/MaintainingProfiles.html).)
+
+<div class="admonition note"> <p class="first admonition-title">Note</p> <p class="last">

+An iOS developer account is required to complete these steps. To register for an iOS developer account, visit the [Apple Developer site](https://developer.apple.com/).
+</p></div>
+
+1. Log in to [Apple's iOS developer portal](https://developer.apple.com/ios/manage/overview/index.action).
+2. In the iOS Apps section, click __Identifiers__, then select __App IDs__.
+3. Click the + icon to create a new App ID, and enter the following:
+
+* __App ID Description - Name__: A unique name that identifies your app.
+* __App BaaS__: Select Push Notifications.
+* __App ID Suffix__: Select Explicit App ID, and enter your desired App ID in reverse-domain format. For example, com.apigee.pushapp.
+
+4. Click __Submit__ to create the App ID, then click __Done__. You will be returned to the App IDs page.
+
+### Generating a .p12 certificate
+
+Finally, you will generate the .p12 certificate using the App ID and signing certificate you created in the previous steps. The .p12 certificate will be sent by Apigee to Apple APNs with all push notification requests. A unique .p12 certificate is required for each app. In addition, you should create separate .p12 certificates for development and production versions of your app.
+
+1. On the App IDs page, click your new App ID, then click Edit.
+2. In the Push Notifications section, under Development SSL Certificate, click Create Certificate.
+
+.. image:: pushsslcertificate.png
+
+3. Click __Choose File__, select the .certSigningRequest file you saved to your Desktop in the previous section, then click __Generate__.
+4. Click __Done__. You will be returned to the App ID settings window.
+5. In the Push Notifications section, click __Download__ to save the certificate (aps_development.cer file) to your Desktop.
+6. Double-click the .cer file to install it in your keychain. The newly installed certificate will appear in your Keychain Access application under My Certificates with a name similar to "Apple Development iOS Push Services: <bundle identifier>".
+7. Control-click the certificate and select __Export__.
+8. Save the certificate to your Desktop as a 'Personal Information Exchange (.p12)' file. (You'll need this file when you create a notifier. For more information, see [Creating notifiers](creating-notifiers.html).
+9. In the password dialog, leave the password field blank, then click __OK__.
+10. In the next dialog, enter your system password, then click __Allow__.
+
+
+## Registering with Google GCM
+To create a notifier for sending notifications, you'll need a Google API project and register your app as part of that project. The project's identifier (project number) will become the sender ID your client code will send when registering. Registering your app will give you an API key you'll use to create a notifier. (For more information see "How the pieces connect" in [Adding push notifications support](adding-push-support.html).)
+
+The following is an abbreviated version of the steps described in the Google documentation on [getting started with Google Cloud Messaging](http://developer.android.com/google/gcm/gs.html). 
+
+To generate a project number and API key, do the following:
+
+1. Go to the [Google API developer web site](https://code.google.com/apis/console/) and log in with your Google ID.
+
+2. Click __Create Project__, enter a project name and ID, then follow the steps required to verify.
+
+3. In the left nav, click __Overview__ to view the project number. Note this number for later use in client code.
+
+.. image:: googleproj0.png
+
+4. Click __APIs__ in the left nav area, then click the button to enable __Google Cloud Messaging for Android__.
+
+.. image:: gcmsetting.png
+
+5. In the left nav, under __APIs and auth__, click __Credentials__.
+
+6. Under __Public API access__, click __Create New Key__.
+
+7. In the __Create a new key__ dialog, click __Server key__. Take care not to choose "Android key," though you might be tempted to. Remember that your push notification requests will be received by Google from Apigee's server (via the notifier your code sends to Apigee), rather than directly from the device your app is installed on.
+
+8. On the __Create a server key...__ dialog, enter the IP address of the server that will be sending the notification request to Google.
+
+9. Click __Create__.
+
+10. On the Credentials page, under __Key for server applications__, copy the __API key__ value for use when creating a notifier to request push notifications from GCM. (For more information, see [Creating notifiers](creating-notifiers.html).)
+

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e5979feb/docs/push-notifications/sendnotification.png
----------------------------------------------------------------------
diff --git a/docs/push-notifications/sendnotification.png b/docs/push-notifications/sendnotification.png
new file mode 100644
index 0000000..fb7d813
Binary files /dev/null and b/docs/push-notifications/sendnotification.png differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e5979feb/docs/push-notifications/troubleshooting.md
----------------------------------------------------------------------
diff --git a/docs/push-notifications/troubleshooting.md b/docs/push-notifications/troubleshooting.md
new file mode 100644
index 0000000..f4519f2
--- /dev/null
+++ b/docs/push-notifications/troubleshooting.md
@@ -0,0 +1,93 @@
+# Troubleshooting 
+
+## Working with Android
+
+### App fails to install on the emulator
+
+* When using the emulator, be sure to note the setup steps in [Push notifications prerequisites](getting-started.html#prerequisites).
+
+* Sometimes installation fails while the emulator is still being launched. Wait until the emulator is up and running (so that you can unlock and interact with the UI), then run the project again.
+
+* Make sure that the order of your Java Build Path matches the order shown in [Tutorial: Push notifications sample app](tutorial.html).
+
+### Push errors
+If pressing the button to send yourself a push throws an exception or doesn't respond:
+
+* Make sure the emulator's target matches the Google API version used in the project.
+
+* In the IDE log, wait until you see that the device has been registered before sending yourself a push.
+Sometimes waiting for the code to run and trying another click gets the push message to you.
+
+* If you successfully send yourself a push message once but fail to again, try one of the following:
+
+Go to the apps list on the device and launch the app from there.
+
+OR 
+
+Uninstall the app from the device, delete the device in the admin portal, and run the project again.
+
+### MismatchSenderId error message from the server when it tries to send a message to your app.
+The sender ID is a number you send to GCM from app code when registering with GCM for notifications. The error might be occurring because the sender ID with which your app is registering at GCM for notifications does not correlate to the API project whose API key was used to create your notifier. First, confirm the following:
+
+* The sender ID in your app code (used when registering with GCM) is the same as your Goole API project number.
+
+* The API key used to create your notifier is the same as the API key in your Google API project.
+
+* The notifier name used in your app code is the same as for the notifier you created in the API BaaS.
+
+It can be possible to make a fix (such as by correcting the sender ID in your app code) and still see this error. If you're still seeing the error, consider create a new API project and notifier, then use their new values in your code:
+
+1. Recreate (or create anew) the Google API project. This will generate a new API key and project number. See Registering with a notification service.
+
+2. Create a new notifier for GCM using the API key you generated with the new API project. See Creating notifiers.
+
+3. Use the new notifier name in your code, along with a new sender ID that is that same value as the Google API project number.
+
+### INVALID_SENDER error message
+The sender ID is a number you send to GCM from app code when registering with GCM for notifications. The "sender" in this case is the Google API project you created to send notification messages. Confirm that the sender ID you're using in code is the same value as the API project number generated when you created your Google API project. See Registering with a notification service.
+
+## Working with PhoneGap Android 
+
+### App fails to install on the emulator
+
+* When using the emulator, be sure to note the setup steps in [Tutorial: Push notifications sample app](tutorial.html).
+
+* Sometimes installation fails while the emulator is still being launched. Wait until the emulator is up and running (so that you can unlock and interact with the UI), then run the project again.
+
+* Make sure that the order of your Java Build Path matches the order shown in [Tutorial: Push notifications sample app](tutorial.html).
+
+### Push errors
+If pressing the button to send yourself a push throws an exception or doesn't respond:
+
+* Make sure the emulator's target matches the Google API version used in the project.
+
+* In the IDE log, wait until you see that the device has been registered before sending yourself a push.
+Sometimes waiting for the code to run and trying another click gets the push message to you.
+
+* If you successfully send yourself a push message once but fail to again, try one of the following:
+
+Go to the apps list on the device and launch the app from there.
+
+OR 
+
+Uninstall the app from the device, delete the device using the admin portal, then run the project again.
+
+### MismatchSenderId error message from the server when it tries to send a message to your app.
+The sender ID is a number you send to GCM from app code when registering with GCM for notifications. The error might be occurring because the sender ID with which your app is registering at GCM for notifications does not correlate to the API project whose API key was used to create your notifier. First, confirm the following:
+
+* The sender ID in your app code (used when registering with GCM) is the same as your Google API project number.
+
+* The API key used to create your notifier is the same as the API key in your Google API project.
+
+* The notifier name used in your app code is the same as for the notifier you created in the API BaaS.
+
+It can be possible to make a fix (such as by correcting the sender ID in your app code) and still see this error. If you're still seeing the error, consider create a new API project and notifier, then use their new values in your code:
+
+1. Recreate (or create anew) the Google API project. This will generate a new API key and project number. See [Registering with a notification service](registration.html).
+
+2. Create a new notifier for GCM using the API key you generated with the new API project. See [Creating notifiers](creating-notifiers.html).
+
+3. Use the new notifier name in your code, along with a new sender ID that is that same value as the Google API project number.
+
+### INVALID_SENDER error message
+The sender ID is a number you send to GCM from app code when registering with GCM for notifications. The "sender" in this case is the Google API project you created to send notification messages. Confirm that the sender ID you're using in code is the same value as the API project number generated when you created your Google API project. See [Registering with a notification service](registration.html).

[53/60] [abbrv] incubator-usergrid git commit: Minor refactoring in API doc generation.

[sn...@apache.org]

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/cbd78b6a/content/docs/rest-endpoints/api-reference.html
----------------------------------------------------------------------
diff --git a/content/docs/rest-endpoints/api-reference.html b/content/docs/rest-endpoints/api-reference.html
index 1241a65..c4841f9 100644
--- a/content/docs/rest-endpoints/api-reference.html
+++ b/content/docs/rest-endpoints/api-reference.html
@@ -21,573 +21,28 @@
     <p>Generated from Swagger.</p>
 <h2>Methods</h2><p>API methods are organized by the tags.</p>
 <p>Following the methods is a listing of all <a href='#models'>Default Entity Models.</p>
-<a name='Action-method'></a>
-<h2>Action Methods</h2>
-
-<div class="panel panel-default">
-    
-    <div class="panel-heading GET">
-        <h2 class="panel-title GET-heading">GET /management/orgs/{orgId}/activate 
-            <a data-toggle="collapse" data-target="#collapse-iN5h4Rfha6"
-                href="#collapse-iN5h4Rfha6" class="collapsed collapse-button"> </a>
-        </h2>
-    </div>
-    
-    <div id="collapse-iN5h4Rfha6" class="panel-body collapse">
-
-        <p>Activate an organization from a link provIded in an email notification.</p>
-
-        <h3>Parameters</h3>
-
-        <ul>
-                <li>
-                    <b>orgId</b> (string) <br>
-                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>token</b> () <br>
-                    Activation token. (Specified in query).
-                </li>
-                <li>
-                    <b>confirm_email</b> () <br>
-                    Send confirmation email or not. (Specified in query).
-                </li>
-        </ul>
-
-        <h3>Responses</h3>
-
-        <ul>
-                <li>
-                    <b>200</b>
-                    <ul>
-                        <li>Description: An array of complete messages.</li>
-                        <li>Schema: [<a href="#action">Action</a>]</li>
-                    </ul>
-                </li>
-                <li>
-                    <b>default</b>
-                    <ul>
-                        <li>Description: Unexpected error.</li>
-                        <li>Schema: [<a href="#error">Error</a>]</li>
-                    </ul>
-                </li>
-        </ul>     
-        
-    </div>
-    <!--<div class="panel-footer"></div>-->
-</div>
-
-<div class="panel panel-default">
-    
-    <div class="panel-heading GET">
-        <h2 class="panel-title GET-heading">GET /management/orgs/{orgId}/reactivate 
-            <a data-toggle="collapse" data-target="#collapse-4JPBNBUnYR"
-                href="#collapse-4JPBNBUnYR" class="collapsed collapse-button"> </a>
-        </h2>
-    </div>
-    
-    <div id="collapse-4JPBNBUnYR" class="panel-body collapse">
-
-        <p>Reactivate an expired organization.</p>
-
-        <h3>Parameters</h3>
-
-        <ul>
-                <li>
-                    <b>orgId</b> (string) <br>
-                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-        </ul>
-
-        <h3>Responses</h3>
-
-        <ul>
-                <li>
-                    <b>200</b>
-                    <ul>
-                        <li>Description: An array of complete messages.</li>
-                        <li>Schema: [<a href="#action">Action</a>]</li>
-                    </ul>
-                </li>
-                <li>
-                    <b>default</b>
-                    <ul>
-                        <li>Description: Unexpected error.</li>
-                        <li>Schema: [<a href="#error">Error</a>]</li>
-                    </ul>
-                </li>
-        </ul>     
-        
-    </div>
-    <!--<div class="panel-footer"></div>-->
-</div>
-
-<div class="panel panel-default">
-    
-    <div class="panel-heading GET">
-        <h2 class="panel-title GET-heading">GET /management/users/resetpw 
-            <a data-toggle="collapse" data-target="#collapse-8Q4qhiQLvH"
-                href="#collapse-8Q4qhiQLvH" class="collapsed collapse-button"> </a>
-        </h2>
-    </div>
-    
-    <div id="collapse-8Q4qhiQLvH" class="panel-body collapse">
-
-        <p>Initiate the reset of an admin user&#39;s password.</p>
-
-        <h3>Parameters</h3>
-
-        <ul>
-        </ul>
-
-        <h3>Responses</h3>
-
-        <ul>
-                <li>
-                    <b>200</b>
-                    <ul>
-                        <li>Description: An array of complete messages.</li>
-                        <li>Schema: [<a href="#action">Action</a>]</li>
-                    </ul>
-                </li>
-                <li>
-                    <b>default</b>
-                    <ul>
-                        <li>Description: Unexpected error.</li>
-                        <li>Schema: [<a href="#error">Error</a>]</li>
-                    </ul>
-                </li>
-        </ul>     
-        
-    </div>
-    <!--<div class="panel-footer"></div>-->
-</div>
+<a name='Access-Tokens-method'></a>
+<h2>Access-Tokens</h2>
 
 <div class="panel panel-default">
     
     <div class="panel-heading POST">
-        <h2 class="panel-title POST-heading">POST /management/users/resetpw 
-            <a data-toggle="collapse" data-target="#collapse-TBw5HyJTTa"
-                href="#collapse-TBw5HyJTTa" class="collapsed collapse-button"> </a>
-        </h2>
-    </div>
-    
-    <div id="collapse-TBw5HyJTTa" class="panel-body collapse">
-
-        <p>Complete the password reset through getting the newpassword and the old one for identification.</p>
-
-        <h3>Parameters</h3>
-
-        <ul>
-                <li>
-                    <b>ResetPWMsg</b> (                    <a href="#resetpwmsg">ResetPWMsg</a>) <br>
-                    Parameters and value for the Captcha challenge, the admin user&#39;s response to the Captcha challenge, and the admin user&#39;s email address. (Specified in body).
-                </li>
-        </ul>
-
-        <h3>Responses</h3>
-
-        <ul>
-                <li>
-                    <b>200</b>
-                    <ul>
-                        <li>Description: An array of complete messages.</li>
-                        <li>Schema: [<a href="#action">Action</a>]</li>
-                    </ul>
-                </li>
-                <li>
-                    <b>default</b>
-                    <ul>
-                        <li>Description: Unexpected error.</li>
-                        <li>Schema: [<a href="#error">Error</a>]</li>
-                    </ul>
-                </li>
-        </ul>     
-        
-    </div>
-    <!--<div class="panel-footer"></div>-->
-</div>
-
-<div class="panel panel-default">
-    
-    <div class="panel-heading GET">
-        <h2 class="panel-title GET-heading">GET /management/users/{userId}/activate 
-            <a data-toggle="collapse" data-target="#collapse-gPyb4FcquB"
-                href="#collapse-gPyb4FcquB" class="collapsed collapse-button"> </a>
+        <h2 class="panel-title POST-heading">POST /management/token 
+            <a data-toggle="collapse" data-target="#collapse-drcFs9dfPU"
+                href="#collapse-drcFs9dfPU" class="collapsed collapse-button"> </a>
         </h2>
     </div>
     
-    <div id="collapse-gPyb4FcquB" class="panel-body collapse">
+    <div id="collapse-drcFs9dfPU" class="panel-body collapse">
 
-        <p>Activate an admin user from a link provIded in an email notification.</p>
+        <p>Login with Admin-User or Organization credentials.</p>
 
         <h3>Parameters</h3>
 
-        <ul>
-                <li>
-                    <b>userId</b> (string) <br>
-                    One of the user&#39;s identification which includes username, real name, email address or UUID. (Specified in path).
-                </li>
-                <li>
-                    <b>token</b> () <br>
-                    Activation token&#39;s query statement. (Specified in query).
-                </li>
-                <li>
-                    <b>confirm_email</b> () <br>
-                    Query statement of whether send confimation email or not. (Specified in query).
-                </li>
-        </ul>
-
-        <h3>Responses</h3>
-
-        <ul>
-                <li>
-                    <b>200</b>
-                    <ul>
-                        <li>Description: An array of complete messages.</li>
-                        <li>Schema: [<a href="#action">Action</a>]</li>
-                    </ul>
-                </li>
-                <li>
-                    <b>default</b>
-                    <ul>
-                        <li>Description: Unexpected error.</li>
-                        <li>Schema: [<a href="#error">Error</a>]</li>
-                    </ul>
-                </li>
-        </ul>     
-        
-    </div>
-    <!--<div class="panel-footer"></div>-->
-</div>
-
-<div class="panel panel-default">
-    
-    <div class="panel-heading PUT">
-        <h2 class="panel-title PUT-heading">PUT /management/users/{userId}/password 
-            <a data-toggle="collapse" data-target="#collapse-eOkQcznynD"
-                href="#collapse-eOkQcznynD" class="collapsed collapse-button"> </a>
-        </h2>
-    </div>
-    
-    <div id="collapse-eOkQcznynD" class="panel-body collapse">
-
-        <p>Update an admin user&#39;s password through getting the newpassword and the old one for identification.</p>
-
-        <h3>Parameters</h3>
-
-        <ul>
-                <li>
-                    <b>userId</b> (string) <br>
-                    One of the user&#39;s identification which includes username, real name, email address or UUID. (Specified in path).
-                </li>
-                <li>
-                    <b>ResetPW</b> (                    <a href="#resetpw">ResetPW</a>) <br>
-                    The user&#39;s old and new password. (Specified in body).
-                </li>
-        </ul>
-
-        <h3>Responses</h3>
-
-        <ul>
-                <li>
-                    <b>200</b>
-                    <ul>
-                        <li>Description: An array of complete messages.</li>
-                        <li>Schema: [<a href="#action">Action</a>]</li>
-                    </ul>
-                </li>
-                <li>
-                    <b>default</b>
-                    <ul>
-                        <li>Description: Unexpected error.</li>
-                        <li>Schema: [<a href="#error">Error</a>]</li>
-                    </ul>
-                </li>
-        </ul>     
-        
-    </div>
-    <!--<div class="panel-footer"></div>-->
-</div>
-
-<div class="panel panel-default">
-    
-    <div class="panel-heading GET">
-        <h2 class="panel-title GET-heading">GET /management/users/{userId}/reactivate 
-            <a data-toggle="collapse" data-target="#collapse-pxE50B5nCD"
-                href="#collapse-pxE50B5nCD" class="collapsed collapse-button"> </a>
-        </h2>
-    </div>
-    
-    <div id="collapse-pxE50B5nCD" class="panel-body collapse">
-
-        <p>Reactivate an expired admin user.</p>
-
-        <h3>Parameters</h3>
-
-        <ul>
-                <li>
-                    <b>userId</b> (string) <br>
-                    One of the user&#39;s identification which includes username, real name, email address or UUID. (Specified in path).
-                </li>
-        </ul>
-
-        <h3>Responses</h3>
-
-        <ul>
-                <li>
-                    <b>200</b>
-                    <ul>
-                        <li>Description: An array of complete messages.</li>
-                        <li>Schema: [<a href="#action">Action</a>]</li>
-                    </ul>
-                </li>
-                <li>
-                    <b>default</b>
-                    <ul>
-                        <li>Description: Unexpected error.</li>
-                        <li>Schema: [<a href="#error">Error</a>]</li>
-                    </ul>
-                </li>
-        </ul>     
-        
-    </div>
-    <!--<div class="panel-footer"></div>-->
-</div>
-
-<div class="panel panel-default">
-    
-    <div class="panel-heading POST">
-        <h2 class="panel-title POST-heading">POST /{orgId}/{appId}/users/{user}/password 
-            <a data-toggle="collapse" data-target="#collapse-sOcj4VS4JA"
-                href="#collapse-sOcj4VS4JA" class="collapsed collapse-button"> </a>
-        </h2>
-    </div>
-    
-    <div id="collapse-sOcj4VS4JA" class="panel-body collapse">
-
-        <p>Set a user&#39;s password or reset the user&#39;s existing password.</p>
-
-        <h3>Parameters</h3>
-
-        <ul>
-                <li>
-                    <b>orgId</b> (string) <br>
-                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>appId</b> (string) <br>
-                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>username</b> (string) <br>
-                    The username of the user. (Specified in path).
-                </li>
-                <li>
-                    <b>ResetPW</b> (                    <a href="#resetpw">ResetPW</a>) <br>
-                    The user&#39;s old and new password. (Specified in body).
-                </li>
-        </ul>
-
-        <h3>Responses</h3>
-
-        <ul>
-                <li>
-                    <b>200</b>
-                    <ul>
-                        <li>Description: An array of complete messages.</li>
-                        <li>Schema: [<a href="#action">Action</a>]</li>
-                    </ul>
-                </li>
-                <li>
-                    <b>default</b>
-                    <ul>
-                        <li>Description: Unexpected error.</li>
-                        <li>Schema: [<a href="#error">Error</a>]</li>
-                    </ul>
-                </li>
-        </ul>     
-        
-    </div>
-    <!--<div class="panel-footer"></div>-->
-</div>
-<a name='ActivityFeed-method'></a>
-<h2>ActivityFeed Methods</h2>
-
-<div class="panel panel-default">
-    
-    <div class="panel-heading GET">
-        <h2 class="panel-title GET-heading">GET /management/orgs/{orgId}/feed 
-            <a data-toggle="collapse" data-target="#collapse-HkB3lyybM0"
-                href="#collapse-HkB3lyybM0" class="collapsed collapse-button"> </a>
-        </h2>
-    </div>
-    
-    <div id="collapse-HkB3lyybM0" class="panel-body collapse">
-
-        <p>Retrieve an organization&#39;s activity feed.</p>
-
-        <h3>Parameters</h3>
-
-        <ul>
-                <li>
-                    <b>orgId</b> (string) <br>
-                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-        </ul>
-
-        <h3>Responses</h3>
-
-        <ul>
-                <li>
-                    <b>200</b>
-                    <ul>
-                        <li>Description: An array of the organization&#39;s ActivityFeed.</li>
-                        <li>Schema: [<a href="#activityfeed">ActivityFeed</a>]</li>
-                    </ul>
-                </li>
-                <li>
-                    <b>default</b>
-                    <ul>
-                        <li>Description: Unexpected error.</li>
-                        <li>Schema: [<a href="#error">Error</a>]</li>
-                    </ul>
-                </li>
-        </ul>     
-        
-    </div>
-    <!--<div class="panel-footer"></div>-->
-</div>
-
-<div class="panel panel-default">
-    
-    <div class="panel-heading GET">
-        <h2 class="panel-title GET-heading">GET /management/users/{userId}/feed 
-            <a data-toggle="collapse" data-target="#collapse-trV5SjBRiv"
-                href="#collapse-trV5SjBRiv" class="collapsed collapse-button"> </a>
-        </h2>
-    </div>
-    
-    <div id="collapse-trV5SjBRiv" class="panel-body collapse">
-
-        <p>Retrieve an admin user&#39;s activity feed.</p>
-
-        <h3>Parameters</h3>
-
-        <ul>
-                <li>
-                    <b>userId</b> (string) <br>
-                    One of the user&#39;s identification which includes username, real name, email address or UUID. (Specified in path).
-                </li>
-        </ul>
-
-        <h3>Responses</h3>
-
-        <ul>
-                <li>
-                    <b>200</b>
-                    <ul>
-                        <li>Description: An array of user&#39;s activity</li>
-                        <li>Schema: [<a href="#activityfeed">ActivityFeed</a>]</li>
-                    </ul>
-                </li>
-                <li>
-                    <b>default</b>
-                    <ul>
-                        <li>Description: Unexpected error.</li>
-                        <li>Schema: [<a href="#error">Error</a>]</li>
-                    </ul>
-                </li>
-        </ul>     
-        
-    </div>
-    <!--<div class="panel-footer"></div>-->
-</div>
-
-<div class="panel panel-default">
-    
-    <div class="panel-heading POST">
-        <h2 class="panel-title POST-heading">POST /{orgId}/{appId}/groups/{groupId}/activities 
-            <a data-toggle="collapse" data-target="#collapse-zj0yM6YokI"
-                href="#collapse-zj0yM6YokI" class="collapsed collapse-button"> </a>
-        </h2>
-    </div>
-    
-    <div id="collapse-zj0yM6YokI" class="panel-body collapse">
-
-        <p>Create an activity to a specific group. In this case the activity is created in the activities collection and is accessible at the /activities endpoint to users who have the permission to read that endpoint. In addition, a relationship is established between the activity and the group, and because of that, the activity will appear in the group’s feed. The group &#39;owns&#39; the activity. Also, the activity will be published in the feed of all users that are members of the group.</p>
-
-        <h3>Parameters</h3>
-
-        <ul>
-                <li>
-                    <b>orgId</b> (string) <br>
-                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>appId</b> (string) <br>
-                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>groupId</b> (string) <br>
-                    One of the group&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>CreateActivity</b> (                    <a href="#createactivity">CreateActivity</a>) <br>
-                    One or more sets of activity properties. (Specified in body).
-                </li>
-        </ul>
-
-        <h3>Responses</h3>
-
-        <ul>
-                <li>
-                    <b>200</b>
-                    <ul>
-                        <li>Description: An array of user&#39;s activity.</li>
-                        <li>Schema: [<a href="#activityfeed">ActivityFeed</a>]</li>
-                    </ul>
-                </li>
-                <li>
-                    <b>default</b>
-                    <ul>
-                        <li>Description: Unexpected error.</li>
-                        <li>Schema: [<a href="#error">Error</a>]</li>
-                    </ul>
-                </li>
-        </ul>     
-        
-    </div>
-    <!--<div class="panel-footer"></div>-->
-</div>
-
-<div class="panel panel-default">
-    
-    <div class="panel-heading GET">
-        <h2 class="panel-title GET-heading">GET /{orgId}/{appId}/groups/{groupId}/feed 
-            <a data-toggle="collapse" data-target="#collapse-gIeQmdnsDx"
-                href="#collapse-gIeQmdnsDx" class="collapsed collapse-button"> </a>
-        </h2>
-    </div>
-    
-    <div id="collapse-gIeQmdnsDx" class="panel-body collapse">
-
-        <p>Get a group&#39;s feed through providing all the identifications.</p>
-
-        <h3>Parameters</h3>
-
-        <ul>
-                <li>
-                    <b>orgId</b> (string) <br>
-                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>appId</b> (string) <br>
-                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
+        <ul>
                 <li>
-                    <b>groupId</b> (string) <br>
-                    One of the group&#39;s identification which includes name or uuid. (Specified in path).
+                    <b>login-credentials</b> (                    <a href="#logincredentials">LoginCredentials</a>) <br>
+                    Login credentials either username/password or id/secret. (Specified in body).
                 </li>
         </ul>
 
@@ -597,8 +52,8 @@
                 <li>
                     <b>200</b>
                     <ul>
-                        <li>Description: An array of group&#39;s activity.</li>
-                        <li>Schema: [<a href="#activityfeed">ActivityFeed</a>]</li>
+                        <li>Description: Object containing access_token.</li>
+                        <li>Schema: [<a href="#accesstokenreponse">AccessTokenReponse</a>]</li>
                     </ul>
                 </li>
                 <li>
@@ -617,34 +72,22 @@
 <div class="panel panel-default">
     
     <div class="panel-heading POST">
-        <h2 class="panel-title POST-heading">POST /{orgId}/{appId}/users/{userId}/activities 
-            <a data-toggle="collapse" data-target="#collapse-L2T56Ztybh"
-                href="#collapse-L2T56Ztybh" class="collapsed collapse-button"> </a>
+        <h2 class="panel-title POST-heading">POST /{orgId}/{appId}/token 
+            <a data-toggle="collapse" data-target="#collapse-XlaRG4JVxJ"
+                href="#collapse-XlaRG4JVxJ" class="collapsed collapse-button"> </a>
         </h2>
     </div>
     
-    <div id="collapse-L2T56Ztybh" class="panel-body collapse">
+    <div id="collapse-XlaRG4JVxJ" class="panel-body collapse">
 
-        <p>Create an activity in the activities collection.</p>
+        <p>Login with App-User or Application credentials.</p>
 
         <h3>Parameters</h3>
 
         <ul>
                 <li>
-                    <b>orgId</b> (string) <br>
-                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>appId</b> (string) <br>
-                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>userId-3</b> (string) <br>
-                    One of the user&#39;s identification which includes username or UUID. (Specified in path).
-                </li>
-                <li>
-                    <b>CreateActivity</b> (                    <a href="#createactivity">CreateActivity</a>) <br>
-                    One or more sets of activity properties. (Specified in body).
+                    <b>login-credentials</b> (                    <a href="#logincredentials">LoginCredentials</a>) <br>
+                    Login credentials either username/password or id/secret. (Specified in body).
                 </li>
         </ul>
 
@@ -654,8 +97,8 @@
                 <li>
                     <b>200</b>
                     <ul>
-                        <li>Description: An array of user&#39;s activity.</li>
-                        <li>Schema: [<a href="#activityfeed">ActivityFeed</a>]</li>
+                        <li>Description: An array of new created Admin user&#39;s info.</li>
+                        <li>Schema: [<a href="#accesstokenreponse">AccessTokenReponse</a>]</li>
                     </ul>
                 </li>
                 <li>
@@ -670,19 +113,21 @@
     </div>
     <!--<div class="panel-footer"></div>-->
 </div>
+<a name='Activities-method'></a>
+<h2>Activities</h2>
 
 <div class="panel panel-default">
     
     <div class="panel-heading GET">
-        <h2 class="panel-title GET-heading">GET /{orgId}/{appId}/users/{userId}/feed 
-            <a data-toggle="collapse" data-target="#collapse-q3sk3xVUu4"
-                href="#collapse-q3sk3xVUu4" class="collapsed collapse-button"> </a>
+        <h2 class="panel-title GET-heading">GET /{orgId}/{appId}/groups/{groupId}/feed 
+            <a data-toggle="collapse" data-target="#collapse-tmnHUKGqLS"
+                href="#collapse-tmnHUKGqLS" class="collapsed collapse-button"> </a>
         </h2>
     </div>
     
-    <div id="collapse-q3sk3xVUu4" class="panel-body collapse">
+    <div id="collapse-tmnHUKGqLS" class="panel-body collapse">
 
-        <p>Retrieve a user&#39;s feed through providing all the identifications.</p>
+        <p>Get a group&#39;s feed through providing all the identifications.</p>
 
         <h3>Parameters</h3>
 
@@ -696,8 +141,8 @@
                     One of the application&#39;s identification which includes name or uuid. (Specified in path).
                 </li>
                 <li>
-                    <b>userId-3</b> (string) <br>
-                    One of the user&#39;s identification which includes username or UUID. (Specified in path).
+                    <b>groupId</b> (string) <br>
+                    One of the group&#39;s identification which includes name or uuid. (Specified in path).
                 </li>
         </ul>
 
@@ -707,7 +152,7 @@
                 <li>
                     <b>200</b>
                     <ul>
-                        <li>Description: An array of user&#39;s activity feed.</li>
+                        <li>Description: An array of group&#39;s activity.</li>
                         <li>Schema: [<a href="#activityfeed">ActivityFeed</a>]</li>
                     </ul>
                 </li>
@@ -723,21 +168,19 @@
     </div>
     <!--<div class="panel-footer"></div>-->
 </div>
-<a name='AppData-method'></a>
-<h2>AppData Methods</h2>
 
 <div class="panel panel-default">
     
-    <div class="panel-heading GET">
-        <h2 class="panel-title GET-heading">GET /management/orgs/{orgId}/apps 
-            <a data-toggle="collapse" data-target="#collapse-2aQqcShABU"
-                href="#collapse-2aQqcShABU" class="collapsed collapse-button"> </a>
+    <div class="panel-heading POST">
+        <h2 class="panel-title POST-heading">POST /{orgId}/{appId}/users/{userId}/activities 
+            <a data-toggle="collapse" data-target="#collapse-oOJfU8LsRY"
+                href="#collapse-oOJfU8LsRY" class="collapsed collapse-button"> </a>
         </h2>
     </div>
     
-    <div id="collapse-2aQqcShABU" class="panel-body collapse">
+    <div id="collapse-oOJfU8LsRY" class="panel-body collapse">
 
-        <p>Retrieve the applications in an organization through providing both Id of application and organization.</p>
+        <p>Create an activity in the activities collection.</p>
 
         <h3>Parameters</h3>
 
@@ -746,54 +189,17 @@
                     <b>orgId</b> (string) <br>
                     One of the organization&#39;s identification which includes name or uuid. (Specified in path).
                 </li>
-        </ul>
-
-        <h3>Responses</h3>
-
-        <ul>
-                <li>
-                    <b>200</b>
-                    <ul>
-                        <li>Description: An array of retrieved application data.</li>
-                        <li>Schema: [<a href="#appdata">AppData</a>]</li>
-                    </ul>
-                </li>
                 <li>
-                    <b>default</b>
-                    <ul>
-                        <li>Description: Unexpected error.</li>
-                        <li>Schema: [<a href="#error">Error</a>]</li>
-                    </ul>
+                    <b>appId</b> (string) <br>
+                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
                 </li>
-        </ul>     
-        
-    </div>
-    <!--<div class="panel-footer"></div>-->
-</div>
-
-<div class="panel panel-default">
-    
-    <div class="panel-heading DELETE">
-        <h2 class="panel-title DELETE-heading">DELETE /management/orgs/{orgId}/apps/{appId} 
-            <a data-toggle="collapse" data-target="#collapse-G319AhhnWy"
-                href="#collapse-G319AhhnWy" class="collapsed collapse-button"> </a>
-        </h2>
-    </div>
-    
-    <div id="collapse-G319AhhnWy" class="panel-body collapse">
-
-        <p>Remove an application from an organization through providing both Id of application and organization.</p>
-
-        <h3>Parameters</h3>
-
-        <ul>
                 <li>
-                    <b>orgId</b> (string) <br>
-                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                    <b>userId-3</b> (string) <br>
+                    One of the user&#39;s identification which includes username or UUID. (Specified in path).
                 </li>
                 <li>
-                    <b>appId</b> (string) <br>
-                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
+                    <b>CreateActivity</b> (                    <a href="#createactivity">CreateActivity</a>) <br>
+                    One or more sets of activity properties. (Specified in body).
                 </li>
         </ul>
 
@@ -803,8 +209,8 @@
                 <li>
                     <b>200</b>
                     <ul>
-                        <li>Description: An array of deleted application info.</li>
-                        <li>Schema: [<a href="#appdata">AppData</a>]</li>
+                        <li>Description: An array of user&#39;s activity.</li>
+                        <li>Schema: [<a href="#activityfeed">ActivityFeed</a>]</li>
                     </ul>
                 </li>
                 <li>
@@ -819,21 +225,19 @@
     </div>
     <!--<div class="panel-footer"></div>-->
 </div>
-<a name='Credential-method'></a>
-<h2>Credential Methods</h2>
 
 <div class="panel panel-default">
     
     <div class="panel-heading GET">
-        <h2 class="panel-title GET-heading">GET /management/orgs/{orgId}/apps/{appId}/credentials 
-            <a data-toggle="collapse" data-target="#collapse-AASgKtaSkG"
-                href="#collapse-AASgKtaSkG" class="collapsed collapse-button"> </a>
+        <h2 class="panel-title GET-heading">GET /{orgId}/{appId}/users/{userId}/feed 
+            <a data-toggle="collapse" data-target="#collapse-pYJU4YKTd8"
+                href="#collapse-pYJU4YKTd8" class="collapsed collapse-button"> </a>
         </h2>
     </div>
     
-    <div id="collapse-AASgKtaSkG" class="panel-body collapse">
+    <div id="collapse-pYJU4YKTd8" class="panel-body collapse">
 
-        <p>Retrieve the client Id and client secret credentials for an application in an organization.</p>
+        <p>Retrieve a user&#39;s feed through providing all the identifications.</p>
 
         <h3>Parameters</h3>
 
@@ -846,6 +250,10 @@
                     <b>appId</b> (string) <br>
                     One of the application&#39;s identification which includes name or uuid. (Specified in path).
                 </li>
+                <li>
+                    <b>userId-3</b> (string) <br>
+                    One of the user&#39;s identification which includes username or UUID. (Specified in path).
+                </li>
         </ul>
 
         <h3>Responses</h3>
@@ -854,8 +262,8 @@
                 <li>
                     <b>200</b>
                     <ul>
-                        <li>Description: An array of retrieved credentials info.</li>
-                        <li>Schema: [<a href="#credential">Credential</a>]</li>
+                        <li>Description: An array of user&#39;s activity feed.</li>
+                        <li>Schema: [<a href="#activityfeed">ActivityFeed</a>]</li>
                     </ul>
                 </li>
                 <li>
@@ -870,19 +278,21 @@
     </div>
     <!--<div class="panel-footer"></div>-->
 </div>
+<a name='Admin-Users-method'></a>
+<h2>Admin-Users</h2>
 
 <div class="panel panel-default">
     
-    <div class="panel-heading POST">
-        <h2 class="panel-title POST-heading">POST /management/orgs/{orgId}/apps/{appId}/credentials 
-            <a data-toggle="collapse" data-target="#collapse-dKcFwuUjzH"
-                href="#collapse-dKcFwuUjzH" class="collapsed collapse-button"> </a>
+    <div class="panel-heading GET">
+        <h2 class="panel-title GET-heading">GET /management/orgs/{orgId}/users 
+            <a data-toggle="collapse" data-target="#collapse-v3QdwGriJl"
+                href="#collapse-v3QdwGriJl" class="collapsed collapse-button"> </a>
         </h2>
     </div>
     
-    <div id="collapse-dKcFwuUjzH" class="panel-body collapse">
+    <div id="collapse-v3QdwGriJl" class="panel-body collapse">
 
-        <p>Generate the client Id and client secret credentials for an application in an organization.</p>
+        <p>Retrieve details about the admin users in an organization.</p>
 
         <h3>Parameters</h3>
 
@@ -891,10 +301,6 @@
                     <b>orgId</b> (string) <br>
                     One of the organization&#39;s identification which includes name or uuid. (Specified in path).
                 </li>
-                <li>
-                    <b>appId</b> (string) <br>
-                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
         </ul>
 
         <h3>Responses</h3>
@@ -903,8 +309,8 @@
                 <li>
                     <b>200</b>
                     <ul>
-                        <li>Description: An array of generated credentials info.</li>
-                        <li>Schema: [<a href="#credential">Credential</a>]</li>
+                        <li>Description: An array of retrieved Admin user&#39;s info.</li>
+                        <li>Schema: [<a href="#user">User</a>]</li>
                     </ul>
                 </li>
                 <li>
@@ -922,16 +328,16 @@
 
 <div class="panel panel-default">
     
-    <div class="panel-heading GET">
-        <h2 class="panel-title GET-heading">GET /management/orgs/{orgId}/credentials 
-            <a data-toggle="collapse" data-target="#collapse-ZMqkJ1AwIr"
-                href="#collapse-ZMqkJ1AwIr" class="collapsed collapse-button"> </a>
+    <div class="panel-heading DELETE">
+        <h2 class="panel-title DELETE-heading">DELETE /management/orgs/{orgId}/users/{userId} 
+            <a data-toggle="collapse" data-target="#collapse-6cRMjJKYQr"
+                href="#collapse-6cRMjJKYQr" class="collapsed collapse-button"> </a>
         </h2>
     </div>
     
-    <div id="collapse-ZMqkJ1AwIr" class="panel-body collapse">
+    <div id="collapse-6cRMjJKYQr" class="panel-body collapse">
 
-        <p>Retrieve the credentials for an organization client.</p>
+        <p>Remove an admin user from an organization through providing both Id of application and organization.</p>
 
         <h3>Parameters</h3>
 
@@ -940,6 +346,10 @@
                     <b>orgId</b> (string) <br>
                     One of the organization&#39;s identification which includes name or uuid. (Specified in path).
                 </li>
+                <li>
+                    <b>userId-2</b> (string) <br>
+                    One of the user&#39;s identification which includes username, email address or UUID. (Specified in path).
+                </li>
         </ul>
 
         <h3>Responses</h3>
@@ -948,8 +358,8 @@
                 <li>
                     <b>200</b>
                     <ul>
-                        <li>Description: An array of Credential</li>
-                        <li>Schema: [<a href="#credential">Credential</a>]</li>
+                        <li>Description: An array of deleted Admin user&#39;s info.</li>
+                        <li>Schema: [<a href="#user">User</a>]</li>
                     </ul>
                 </li>
                 <li>
@@ -968,22 +378,22 @@
 <div class="panel panel-default">
     
     <div class="panel-heading POST">
-        <h2 class="panel-title POST-heading">POST /management/orgs/{orgId}/credentials 
-            <a data-toggle="collapse" data-target="#collapse-eG7QcoefBR"
-                href="#collapse-eG7QcoefBR" class="collapsed collapse-button"> </a>
+        <h2 class="panel-title POST-heading">POST /management/users 
+            <a data-toggle="collapse" data-target="#collapse-bVYwPxPrHs"
+                href="#collapse-bVYwPxPrHs" class="collapsed collapse-button"> </a>
         </h2>
     </div>
     
-    <div id="collapse-eG7QcoefBR" class="panel-body collapse">
+    <div id="collapse-bVYwPxPrHs" class="panel-body collapse">
 
-        <p>Generate whole new credentials for an organization client.</p>
+        <p>Create a whole new admin user.</p>
 
         <h3>Parameters</h3>
 
         <ul>
                 <li>
-                    <b>orgId</b> (string) <br>
-                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                    <b>adminuserproperty</b> (                    <a href="#createadminuser">CreateAdminUser</a>) <br>
+                    One or more sets of user properties of which username is mandatory and must be unique. (Specified in body).
                 </li>
         </ul>
 
@@ -993,8 +403,8 @@
                 <li>
                     <b>200</b>
                     <ul>
-                        <li>Description: An array of Credential</li>
-                        <li>Schema: [<a href="#credential">Credential</a>]</li>
+                        <li>Description: An array of new created Admin user&#39;s info.</li>
+                        <li>Schema: [<a href="#user">User</a>]</li>
                     </ul>
                 </li>
                 <li>
@@ -1009,37 +419,23 @@
     </div>
     <!--<div class="panel-footer"></div>-->
 </div>
-<a name='Devices-method'></a>
-<h2>Devices Methods</h2>
 
 <div class="panel panel-default">
     
     <div class="panel-heading GET">
-        <h2 class="panel-title GET-heading">GET /{orgId}/{appId}/{notificationId}/*/queue 
-            <a data-toggle="collapse" data-target="#collapse-m94kArvzxi"
-                href="#collapse-m94kArvzxi" class="collapsed collapse-button"> </a>
+        <h2 class="panel-title GET-heading">GET /management/users/resetpw 
+            <a data-toggle="collapse" data-target="#collapse-7WBllKwJ3P"
+                href="#collapse-7WBllKwJ3P" class="collapsed collapse-button"> </a>
         </h2>
     </div>
     
-    <div id="collapse-m94kArvzxi" class="panel-body collapse">
+    <div id="collapse-7WBllKwJ3P" class="panel-body collapse">
 
-        <p>Retrieve the list of devices associated with one or more notifications before the notifications are sent through providing all the identifications.</p>
+        <p>Initiate the reset of an admin user&#39;s password.</p>
 
         <h3>Parameters</h3>
 
         <ul>
-                <li>
-                    <b>orgId</b> (string) <br>
-                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>appId</b> (string) <br>
-                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>notificationId</b> (string) <br>
-                    One of the notification&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
         </ul>
 
         <h3>Responses</h3>
@@ -1048,8 +444,8 @@
                 <li>
                     <b>200</b>
                     <ul>
-                        <li>Description: An array of retrieved device&#39;s info.</li>
-                        <li>Schema: [<a href="#device">Device</a>]</li>
+                        <li>Description: An array of complete messages.</li>
+                        <li>Schema: [<a href="#action">Action</a>]</li>
                     </ul>
                 </li>
                 <li>
@@ -1064,44 +460,26 @@
     </div>
     <!--<div class="panel-footer"></div>-->
 </div>
-<a name='Entity-method'></a>
-<h2>Entity Methods</h2>
 
 <div class="panel panel-default">
     
-    <div class="panel-heading GET">
-        <h2 class="panel-title GET-heading">GET /{orgId}/{appId}/users/{userId}/{relation} 
-            <a data-toggle="collapse" data-target="#collapse-pIaAhJWMZp"
-                href="#collapse-pIaAhJWMZp" class="collapsed collapse-button"> </a>
+    <div class="panel-heading POST">
+        <h2 class="panel-title POST-heading">POST /management/users/resetpw 
+            <a data-toggle="collapse" data-target="#collapse-OBQT3BKr5H"
+                href="#collapse-OBQT3BKr5H" class="collapsed collapse-button"> </a>
         </h2>
     </div>
     
-    <div id="collapse-pIaAhJWMZp" class="panel-body collapse">
+    <div id="collapse-OBQT3BKr5H" class="panel-body collapse">
 
-        <p>Retrieve a user&#39;s collections or connections through query statement.</p>
+        <p>Complete the password reset through getting the newpassword and the old one for identification.</p>
 
         <h3>Parameters</h3>
 
         <ul>
                 <li>
-                    <b>orgId</b> (string) <br>
-                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>appId</b> (string) <br>
-                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>userId-3</b> (string) <br>
-                    One of the user&#39;s identification which includes username or UUID. (Specified in path).
-                </li>
-                <li>
-                    <b>relation</b> (string) <br>
-                    The relation between user and collections. (Specified in path).
-                </li>
-                <li>
-                    <b>queryStatement</b> () <br>
-                    The query statement of the user. (Specified in query).
+                    <b>ResetPWMsg</b> (                    <a href="#resetpwmsg">ResetPWMsg</a>) <br>
+                    Parameters and value for the Captcha challenge, the admin user&#39;s response to the Captcha challenge, and the admin user&#39;s email address. (Specified in body).
                 </li>
         </ul>
 
@@ -1111,8 +489,8 @@
                 <li>
                     <b>200</b>
                     <ul>
-                        <li>Description: An array of user&#39;s collections info.</li>
-                        <li>Schema: [<a href="#entity">Entity</a>]</li>
+                        <li>Description: An array of complete messages.</li>
+                        <li>Schema: [<a href="#action">Action</a>]</li>
                     </ul>
                 </li>
                 <li>
@@ -1131,34 +509,22 @@
 <div class="panel panel-default">
     
     <div class="panel-heading GET">
-        <h2 class="panel-title GET-heading">GET /{orgId}/{appId}/{collectionId} 
-            <a data-toggle="collapse" data-target="#collapse-xW56KedRyq"
-                href="#collapse-xW56KedRyq" class="collapsed collapse-button"> </a>
+        <h2 class="panel-title GET-heading">GET /management/users/{userId} 
+            <a data-toggle="collapse" data-target="#collapse-PiHbAwNiA5"
+                href="#collapse-PiHbAwNiA5" class="collapsed collapse-button"> </a>
         </h2>
     </div>
     
-    <div id="collapse-xW56KedRyq" class="panel-body collapse">
+    <div id="collapse-PiHbAwNiA5" class="panel-body collapse">
 
-        <p>Retrieve collection through query statement.</p>
+        <p>Retrieve details about an admin user.</p>
 
         <h3>Parameters</h3>
 
         <ul>
                 <li>
-                    <b>orgId</b> (string) <br>
-                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>appId</b> (string) <br>
-                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>collectionId</b> (string) <br>
-                    One of the collection&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>queryStatement</b> () <br>
-                    Any values specified in the query statement should be enclosed in single-quotes. (Specified in query).
+                    <b>userId</b> (string) <br>
+                    One of the user&#39;s identification which includes username, real name, email address or UUID. (Specified in path).
                 </li>
         </ul>
 
@@ -1168,8 +534,8 @@
                 <li>
                     <b>200</b>
                     <ul>
-                        <li>Description: An array of retrieved collection&#39;s info.</li>
-                        <li>Schema: [<a href="#entity">Entity</a>]</li>
+                        <li>Description: An array of user&#39;s details</li>
+                        <li>Schema: [<a href="#user">User</a>]</li>
                     </ul>
                 </li>
                 <li>
@@ -1188,34 +554,22 @@
 <div class="panel panel-default">
     
     <div class="panel-heading PUT">
-        <h2 class="panel-title PUT-heading">PUT /{orgId}/{appId}/{collectionId} 
-            <a data-toggle="collapse" data-target="#collapse-Zy8ncQAeme"
-                href="#collapse-Zy8ncQAeme" class="collapsed collapse-button"> </a>
+        <h2 class="panel-title PUT-heading">PUT /management/users/{userId} 
+            <a data-toggle="collapse" data-target="#collapse-Gep5hzbYRO"
+                href="#collapse-Gep5hzbYRO" class="collapsed collapse-button"> </a>
         </h2>
     </div>
     
-    <div id="collapse-Zy8ncQAeme" class="panel-body collapse">
+    <div id="collapse-Gep5hzbYRO" class="panel-body collapse">
 
-        <p>Update collection through query statement.</p>
+        <p>Update the info of an admin user.</p>
 
         <h3>Parameters</h3>
 
         <ul>
                 <li>
-                    <b>orgId</b> (string) <br>
-                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>appId</b> (string) <br>
-                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>collectionId</b> (string) <br>
-                    One of the collection&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>queryStatement</b> () <br>
-                    Any values specified in the query statement should be enclosed in single-quotes. (Specified in query).
+                    <b>userId</b> (string) <br>
+                    One of the user&#39;s identification which includes username, real name, email address or UUID. (Specified in path).
                 </li>
         </ul>
 
@@ -1225,8 +579,8 @@
                 <li>
                     <b>200</b>
                     <ul>
-                        <li>Description: An array of updated collection&#39;s info.</li>
-                        <li>Schema: [<a href="#entity">Entity</a>]</li>
+                        <li>Description: An array of user&#39;s details.</li>
+                        <li>Schema: [<a href="#user">User</a>]</li>
                     </ul>
                 </li>
                 <li>
@@ -1244,43 +598,31 @@
 
 <div class="panel panel-default">
     
-    <div class="panel-heading POST">
-        <h2 class="panel-title POST-heading">POST /{orgId}/{appId}/{collectionId}/{entityId1}/{relation}/{entityId2} 
-            <a data-toggle="collapse" data-target="#collapse-ocB2PheyLp"
-                href="#collapse-ocB2PheyLp" class="collapsed collapse-button"> </a>
+    <div class="panel-heading GET">
+        <h2 class="panel-title GET-heading">GET /management/users/{userId}/activate 
+            <a data-toggle="collapse" data-target="#collapse-8lFgKne5Tw"
+                href="#collapse-8lFgKne5Tw" class="collapsed collapse-button"> </a>
         </h2>
     </div>
     
-    <div id="collapse-ocB2PheyLp" class="panel-body collapse">
+    <div id="collapse-8lFgKne5Tw" class="panel-body collapse">
 
-        <p>Add an entity to a collection through providing all the identifications.</p>
+        <p>Activate an admin user from a link provIded in an email notification.</p>
 
         <h3>Parameters</h3>
 
         <ul>
                 <li>
-                    <b>orgId</b> (string) <br>
-                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>appId</b> (string) <br>
-                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>collectionId</b> (string) <br>
-                    One of the collection&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>entityId1</b> (string) <br>
-                    The Id of the 1st entity. (Specified in path).
+                    <b>userId</b> (string) <br>
+                    One of the user&#39;s identification which includes username, real name, email address or UUID. (Specified in path).
                 </li>
                 <li>
-                    <b>relation</b> (string) <br>
-                    The relation between 1st entity and 2nd entity. (Specified in path).
+                    <b>token</b> (string) <br>
+                    Activation token&#39;s query statement. (Specified in query).
                 </li>
-                <li>
-                    <b>entityId2</b> (string) <br>
-                    The Id of the 2nd entity. (Specified in path).
+                <li>
+                    <b>confirm_email</b> (boolean) <br>
+                    Query statement of whether send confimation email or not. (Specified in query).
                 </li>
         </ul>
 
@@ -1290,8 +632,8 @@
                 <li>
                     <b>200</b>
                     <ul>
-                        <li>Description: An array of added entity&#39;s info.</li>
-                        <li>Schema: [<a href="#entity">Entity</a>]</li>
+                        <li>Description: An array of complete messages.</li>
+                        <li>Schema: [<a href="#action">Action</a>]</li>
                     </ul>
                 </li>
                 <li>
@@ -1309,43 +651,27 @@
 
 <div class="panel panel-default">
     
-    <div class="panel-heading DELETE">
-        <h2 class="panel-title DELETE-heading">DELETE /{orgId}/{appId}/{collectionId}/{entityId1}/{relation}/{entityId2} 
-            <a data-toggle="collapse" data-target="#collapse-5zFww1vFfs"
-                href="#collapse-5zFww1vFfs" class="collapsed collapse-button"> </a>
+    <div class="panel-heading PUT">
+        <h2 class="panel-title PUT-heading">PUT /management/users/{userId}/password 
+            <a data-toggle="collapse" data-target="#collapse-xHaeQAbaqd"
+                href="#collapse-xHaeQAbaqd" class="collapsed collapse-button"> </a>
         </h2>
     </div>
     
-    <div id="collapse-5zFww1vFfs" class="panel-body collapse">
+    <div id="collapse-xHaeQAbaqd" class="panel-body collapse">
 
-        <p>Remove an entity from a collection through providing all the identifications.</p>
+        <p>Update an admin user&#39;s password through getting the newpassword and the old one for identification.</p>
 
         <h3>Parameters</h3>
 
         <ul>
                 <li>
-                    <b>orgId</b> (string) <br>
-                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>appId</b> (string) <br>
-                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>collectionId</b> (string) <br>
-                    One of the collection&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>entityId1</b> (string) <br>
-                    The Id of the 1st entity. (Specified in path).
-                </li>
-                <li>
-                    <b>relation</b> (string) <br>
-                    The relation between 1st entity and 2nd entity. (Specified in path).
+                    <b>userId</b> (string) <br>
+                    One of the user&#39;s identification which includes username, real name, email address or UUID. (Specified in path).
                 </li>
                 <li>
-                    <b>entityId2</b> (string) <br>
-                    The Id of the 2nd entity. (Specified in path).
+                    <b>ResetPW</b> (                    <a href="#resetpw">ResetPW</a>) <br>
+                    The user&#39;s old and new password. (Specified in body).
                 </li>
         </ul>
 
@@ -1355,8 +681,8 @@
                 <li>
                     <b>200</b>
                     <ul>
-                        <li>Description: An array of deleted entity&#39;s info.</li>
-                        <li>Schema: [<a href="#entity">Entity</a>]</li>
+                        <li>Description: An array of complete messages.</li>
+                        <li>Schema: [<a href="#action">Action</a>]</li>
                     </ul>
                 </li>
                 <li>
@@ -1375,34 +701,22 @@
 <div class="panel panel-default">
     
     <div class="panel-heading GET">
-        <h2 class="panel-title GET-heading">GET /{orgId}/{appId}/{collectionId}/{entityId} 
-            <a data-toggle="collapse" data-target="#collapse-1dov3vPnls"
-                href="#collapse-1dov3vPnls" class="collapsed collapse-button"> </a>
+        <h2 class="panel-title GET-heading">GET /management/users/{userId}/reactivate 
+            <a data-toggle="collapse" data-target="#collapse-aPY008UTT5"
+                href="#collapse-aPY008UTT5" class="collapsed collapse-button"> </a>
         </h2>
     </div>
     
-    <div id="collapse-1dov3vPnls" class="panel-body collapse">
+    <div id="collapse-aPY008UTT5" class="panel-body collapse">
 
-        <p>Retrieve an entity through providing Id of application, organization, collection and entity.</p>
+        <p>Reactivate an expired admin user.</p>
 
         <h3>Parameters</h3>
 
         <ul>
                 <li>
-                    <b>orgId</b> (string) <br>
-                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>appId</b> (string) <br>
-                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>collectionId</b> (string) <br>
-                    One of the collection&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>entityId</b> (string) <br>
-                    One of the entity&#39;s identification which includes name or uuid. (Specified in path).
+                    <b>userId</b> (string) <br>
+                    One of the user&#39;s identification which includes username, real name, email address or UUID. (Specified in path).
                 </li>
         </ul>
 
@@ -1412,8 +726,8 @@
                 <li>
                     <b>200</b>
                     <ul>
-                        <li>Description: An array of retrieved entity&#39;s info.</li>
-                        <li>Schema: [<a href="#entity">Entity</a>]</li>
+                        <li>Description: An array of complete messages.</li>
+                        <li>Schema: [<a href="#action">Action</a>]</li>
                     </ul>
                 </li>
                 <li>
@@ -1428,19 +742,21 @@
     </div>
     <!--<div class="panel-footer"></div>-->
 </div>
+<a name='App-Users-method'></a>
+<h2>App-Users</h2>
 
 <div class="panel panel-default">
     
-    <div class="panel-heading PUT">
-        <h2 class="panel-title PUT-heading">PUT /{orgId}/{appId}/{collectionId}/{entityId} 
-            <a data-toggle="collapse" data-target="#collapse-CMPoM2NkHk"
-                href="#collapse-CMPoM2NkHk" class="collapsed collapse-button"> </a>
+    <div class="panel-heading GET">
+        <h2 class="panel-title GET-heading">GET /{orgId}/{appId}/users 
+            <a data-toggle="collapse" data-target="#collapse-yQoflCFgcD"
+                href="#collapse-yQoflCFgcD" class="collapsed collapse-button"> </a>
         </h2>
     </div>
     
-    <div id="collapse-CMPoM2NkHk" class="panel-body collapse">
+    <div id="collapse-yQoflCFgcD" class="panel-body collapse">
 
-        <p>One or more properties can be updated with a single request.</p>
+        <p>Retrieve users though query statement.</p>
 
         <h3>Parameters</h3>
 
@@ -1454,16 +770,8 @@
                     One of the application&#39;s identification which includes name or uuid. (Specified in path).
                 </li>
                 <li>
-                    <b>collectionId</b> (string) <br>
-                    One of the collection&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>entityId</b> (string) <br>
-                    One of the entity&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>entityproperty</b> (                    <a href="#createentities">CreateEntities</a>) <br>
-                    The properties of the entity. (Specified in body).
+                    <b>queryStatement</b> (string) <br>
+                    The query statement of the User. (Specified in query).
                 </li>
         </ul>
 
@@ -1473,8 +781,8 @@
                 <li>
                     <b>200</b>
                     <ul>
-                        <li>Description: An array of updated entity&#39;s info.</li>
-                        <li>Schema: [<a href="#entity">Entity</a>]</li>
+                        <li>Description: An array of retrieved user&#39;s info.</li>
+                        <li>Schema: [<a href="#user">User</a>]</li>
                     </ul>
                 </li>
                 <li>
@@ -1492,16 +800,16 @@
 
 <div class="panel panel-default">
     
-    <div class="panel-heading DELETE">
-        <h2 class="panel-title DELETE-heading">DELETE /{orgId}/{appId}/{collectionId}/{entityId} 
-            <a data-toggle="collapse" data-target="#collapse-Jg2pLwSrSu"
-                href="#collapse-Jg2pLwSrSu" class="collapsed collapse-button"> </a>
+    <div class="panel-heading POST">
+        <h2 class="panel-title POST-heading">POST /{orgId}/{appId}/users 
+            <a data-toggle="collapse" data-target="#collapse-xoM0nnodXH"
+                href="#collapse-xoM0nnodXH" class="collapsed collapse-button"> </a>
         </h2>
     </div>
     
-    <div id="collapse-Jg2pLwSrSu" class="panel-body collapse">
+    <div id="collapse-xoM0nnodXH" class="panel-body collapse">
 
-        <p>Delete an entity from the collection.</p>
+        <p>Create a user in the users collection through providing all the identifications.</p>
 
         <h3>Parameters</h3>
 
@@ -1515,12 +823,8 @@
                     One of the application&#39;s identification which includes name or uuid. (Specified in path).
                 </li>
                 <li>
-                    <b>collectionId</b> (string) <br>
-                    One of the collection&#39;s identification which includes name or uuid. (Specified in path).
-                </li>
-                <li>
-                    <b>entityId</b> (string) <br>
-                    One of the entity&#39;s identification which includes name or uuid. (Specified in path).
+                    <b>CreateUser</b> (                    <a href="#createuser">CreateUser</a>) <br>
+                    The properties of the user. (Specified in body).
                 </li>
         </ul>
 
@@ -1530,8 +834,8 @@
                 <li>
                     <b>200</b>
                     <ul>
-                        <li>Description: An array of deleted entity&#39;s info.</li>
-                        <li>Schema: [<a href="#entity">Entity</a>]</li>
+                        <li>Description: An array of created user&#39;s info.</li>
+                        <li>Schema: [<a href="#user">User</a>]</li>
                     </ul>
                 </li>
                 <li>
@@ -1549,16 +853,16 @@
 
 <div class="panel panel-default">
     
-    <div class="panel-heading POST">
-        <h2 class="panel-title POST-heading">POST /{orgId}/{appId}/{entitytype} 
-            <a data-toggle="collapse" data-target="#collapse-o8OSLLkp41"
-                href="#collapse-o8OSLLkp41" class="collapsed collapse-button"> </a>
+    <div class="panel-heading GET">
+        <h2 class="panel-title GET-heading">GET /{orgId}/{appId}/users/{userId} 
+            <a data-toggle="collapse" data-target="#collapse-nwtxxd6sC5"
+                href="#collapse-nwtxxd6sC5" class="collapsed collapse-button"> </a>
         </h2>
     </div>
     
-    <div id="collapse-o8OSLLkp41" class="panel-body collapse">
+    <div id="collapse-nwtxxd6sC5" class="panel-body collapse">
 
-        <p>When a new entity is created, Usergrid will automatically create a corresponding collection if one does not already exist. The collection will automatically be named with the plural form of the entity type. </p>
+        <p>Retrieve a user through providing all the identifications.</p>
 
         <h3>Parameters</h3>
 
@@ -1572,12 +876,8 @@
                     One of the application&#39;s identification which includes name or uuid. (Specified in path).
                 </li>
                 <li>
-                    <b>entitytype</b> (string) <br>
-                    The entity type to create. (Specified in path).
-                </li>
-                <li>
-                    <b>entityproperty</b> (                    <a href="#createentities">CreateEntities</a>) <br>
-                    The properties of the entity. (Specified in body).
+                    <b>userId-2</b> (string) <br>
+                    One of the user&#39;s identification which includes username, email address or UUID. (Specified in path).
                 </li>
         </ul>
 
@@ -1587,8 +887,8 @@
                 <li>
                     <b>200</b>
                     <ul>
-                        <li>Description: An array of created custom entity&#39;s info.</li>
-                        <li>Schema: [<a href="#entity">Entity</a>]</li>
+                        <li>Description: An array of retrieved user&#39;s info.</li>
+                        <li>Schema: [<a href="#user">User</a>]</li>
                     </ul>
                 </li>
                 <li>
@@ -1603,21 +903,19 @@
     </div>
     <!--<div class="panel-footer"></div>-->
 </div>
-<a name='Event-method'></a>
-<h2>Event Methods</h2>
 
 <div class="panel panel-default">
     
-    <div class="panel-heading POST">
-        <h2 class="panel-title POST-heading">POST /{orgId}/{appId}/events 
-            <a data-toggle="collapse" data-target="#collapse-qnPBoA07vy"
-                href="#collapse-qnPBoA07vy" class="collapsed collapse-button"> </a>
+    <div class="panel-heading PUT">
+        <h2 class="panel-title PUT-heading">PUT /{orgId}/{appId}/users/{userId} 
+            <a data-toggle="collapse" data-target="#collapse-1ouK9M0Buc"
+                href="#collapse-1ouK9M0Buc" class="collapsed collapse-button"> </a>
         </h2>
     </div>
     
-    <div id="collapse-qnPBoA07vy" class="panel-body collapse">
+    <div id="collapse-1ouK9M0Buc" class="panel-body collapse">
 
-        <p>Create an event through providing both Id of organization and application.</p>
+        <p>Update a user through providing all the identifications.</p>
 
         <h3>Parameters</h3>
 
@@ -1631,8 +929,8 @@
                     One of the application&#39;s identification which includes name or uuid. (Specified in path).
                 </li>
                 <li>
-                    <b>CreateEvent</b> (                    <a href="#createevent">CreateEvent</a>) <br>
-                    The required property of the event. (Specified in body).
+                    <b>userId-3</b> (string) <br>
+                    One of the user&#39;s identification which includes username or UUID. (Specified in path).
                 </li>
         </ul>
 
@@ -1642,8 +940,8 @@
                 <li>
                     <b>200</b>
                     <ul>
-                        <li>Description: An array of created event&#39;s info.</li>
-                        <li>Schema: [<a href="#event">Event</a>]</li>
+                        <li>Description: An array of updated user&#39;s info.</li>
+                        <li>Schema: [<a href="#user">User</a>]</li>
                     </ul>
                 </li>
                 <li>
@@ -1658,21 +956,19 @@
     </div>
     <!--<div class="panel-footer"></div>-->
 </div>
-<a name='Group-method'></a>
-<h2>Group Methods</h2>
 
 <div class="panel panel-default">
     
-    <div class="panel-heading POST">
-        <h2 class="panel-title POST-heading">POST /{orgId}/{appId}/groups 
-            <a data-toggle="collapse" data-target="#collapse-4qiW3TsSSu"
-                href="#collapse-4qiW3TsSSu" class="collapsed collapse-button"> </a>
+    <div class="panel-heading DELETE">
+        <h2 class="panel-title DELETE-heading">DELETE /{orgId}/{appId}/users/{userId} 
+            <a data-toggle="collapse" data-target="#collapse-Il1v6OOFVy"
+                href="#collapse-Il1v6OOFVy" class="collapsed collapse-button"> </a>
         </h2>
     </div>
     
-    <div id="collapse-4qiW3TsSSu" class="panel-body collapse">
+    <div id="collapse-Il1v6OOFVy" class="panel-body collapse">
 
-        <p>Create a new group through providing both Id of organization and application.</p>
+        <p>Remove a user through providing all the identifications.</p>
 
         <h3>Parameters</h3>
 
@@ -1686,8 +982,8 @@
                     One of the application&#39;s identification which includes name or uuid. (Specified in path).
                 </li>
                 <li>
-                    <b>groupproperty</b> (                    <a href="#creategroup">CreateGroup</a>) <br>
-                    The property of the created group. (Specified in body).
+                    <b>userId-3</b> (string) <br>
+                    One of the user&#39;s identification which includes username or UUID. (Specified in path).
                 </li>
         </ul>
 
@@ -1697,8 +993,8 @@
                 <li>
                     <b>200</b>
                     <ul>
-                        <li>Description: An array of created group&#39;s info.</li>
-                        <li>Schema: [<a href="#group">Group</a>]</li>
+                        <li>Description: An array of deleted user&#39;s info.</li>
+                        <li>Schema: [<a href="#user">User</a>]</li>
                     </ul>
                 </li>
                 <li>
@@ -1716,16 +1012,16 @@
 
 <div class="panel panel-default">
     
-    <div class="panel-heading GET">
-        <h2 class="panel-title GET-heading">GET /{org_Id}/{app_Id}/groups/{groupId} 
-            <a data-toggle="collapse" data-target="#collapse-mh3TFMiqlw"
-                href="#collapse-mh3TFMiqlw" class="collapsed collapse-button"> </a>
+    <div class="panel-heading POST">
+        <h2 class="panel-title POST-heading">POST /{orgId}/{appId}/users/{user}/password 
+            <a data-toggle="collapse" data-target="#collapse-imri2jPPiC"
+                href="#collapse-imri2jPPiC" class="collapsed collapse-button"> </a>
         </h2>
     </div>
     
-    <div id="collapse-mh3TFMiqlw" class="panel-body collapse">
+    <div id="collapse-imri2jPPiC" class="panel-body collapse">
 
-        <p>Get a group through through providing all the identifications.</p>
+        <p>Set a user&#39;s password or reset the user&#39;s existing password.</p>
 
         <h3>Parameters</h3>
 
@@ -1739,8 +1035,12 @@
                     One of the application&#39;s identification which includes name or uuid. (Specified in path).
                 </li>
                 <li>
-                    <b>groupId</b> (string) <br>
-                    One of the group&#39;s identification which includes name or uuid. (Specified in path).
+                    <b>username</b> (string) <br>
+                    The username of the user. (Specified in path).
+                </li>
+                <li>
+                    <b>ResetPW</b> (                    <a href="#resetpw">ResetPW</a>) <br>
+                    The user&#39;s old and new password. (Specified in body).
                 </li>
         </ul>
 
@@ -1750,8 +1050,8 @@
                 <li>
                     <b>200</b>
                     <ul>
-                        <li>Description: An array of retrieved group&#39;s info.</li>
-                        <li>Schema: [<a href="#group">Group</a>]</li>
+                        <li>Description: An array of complete messages.</li>
+                        <li>Schema: [<a href="#action">Action</a>]</li>
                     </ul>
                 </li>
                 <li>
@@ -1766,19 +1066,21 @@
     </div>
     <!--<div class="panel-footer"></div>-->
 </div>
+<a name='Entities-Collections-method'></a>
+<h2>Entities-Collections</h2>
 
 <div class="panel panel-default">
     
-    <div class="panel-heading PUT">
-        <h2 class="panel-title PUT-heading">PUT /{org_Id}/{app_Id}/groups/{groupId} 
-            <a data-toggle="collapse" data-target="#collapse-Ytvz84UP9Q"
-                href="#collapse-Ytvz84UP9Q" class="collapsed collapse-button"> </a>
+    <div class="panel-heading GET">
+        <h2 class="panel-title GET-heading">GET /{orgId}/{appId}/users/{userId}/{relation} 
+            <a data-toggle="collapse" data-target="#collapse-SIBQHXJ8cG"
+                href="#collapse-SIBQHXJ8cG" class="collapsed collapse-button"> </a>
         </h2>
     </div>
     
-    <div id="collapse-Ytvz84UP9Q" class="panel-body collapse">
+    <div id="collapse-SIBQHXJ8cG" class="panel-body collapse">
 
-        <p>Update a group through providing all the identifications.</p>
+        <p>Retrieve a user&#39;s collections or connections through query statement.</p>
 
         <h3>Parameters</h3>
 
@@ -1792,8 +1094,16 @@
                     One of the application&#39;s identification which includes name or uuid. (Specified in path).
                 </li>
                 <li>
-                    <b>groupId</b> (string) <br>
-                    One of the group&#39;s identification which includes name or uuid. (Specified in path).
+                    <b>userId-3</b> (string) <br>
+                    One of the user&#39;s identification which includes username or UUID. (Specified in path).
+                </li>
+                <li>
+                    <b>relation</b> (string) <br>
+                    The relation between user and collections. (Specified in path).
+                </li>
+                <li>
+                    <b>queryStatement</b> (string) <br>
+                    The query statement of the user. (Specified in query).
                 </li>
         </ul>
 
@@ -1803,8 +1113,8 @@
                 <li>
                     <b>200</b>
                     <ul>
-                        <li>Description: An array of updated group&#39;s info.</li>
-                        <li>Schema: [<a href="#group">Group</a>]</li>
+                        <li>Description: An array of user&#39;s collections info.</li>
+                        <li>Schema: [<a href="#entity">Entity</a>]</li>
                     </ul>
                 </li>
                 <li>
@@ -1819,32 +1129,38 @@
     </div>
     <!--<div class="panel-footer"></div>-->
 </div>
-<a name='Notification-method'></a>
-<h2>Notification Methods</h2>
 
 <div class="panel panel-default">
     
-    <div class="panel-heading PUT">
-        <h2 class="panel-title PUT-heading">PUT /my-org/sandbox/notifications/{notificationId} 
-            <a data-toggle="collapse" data-target="#collapse-2X3BWwAy5v"
-                href="#collapse-2X3BWwAy5v" class="collapsed collapse-button"> </a>
+    <div class="panel-heading GET">
+        <h2 class="panel-title GET-heading">GET /{orgId}/{appId}/{collectionId} 
+            <a data-toggle="collapse" data-target="#collapse-dJMRYq1Xcc"
+                href="#collapse-dJMRYq1Xcc" class="collapsed collapse-button"> </a>
         </h2>
     </div>
     
-    <div id="collapse-2X3BWwAy5v" class="panel-body collapse">
+    <div id="collapse-dJMRYq1Xcc" class="panel-body collapse">
 
-        <p>Cancel sent notifications through providing the Id of the notification.</p>
+        <p>Retrieve collection through query statement.</p>
 
         <h3>Parameters</h3>
 
         <ul>
                 <li>
-                    <b>notificationId</b> (string) <br>
-                    One of the notification&#39;s identification which includes name or uuid. (Specified in path).
+                    <b>orgId</b> (string) <br>
+                    One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>appId</b> (string) <br>
+                    One of the application&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>collectionId</b> (string) <br>
+                    One of the collection&#39;s identification which includes name or uuid. (Specified in path).
                 </li>
                 <li>
-                    <b>cancelMsg</b> (                    <a href="#cancelmsg">CancelMSG</a>) <br>
-                    Indicete whether is canceled or not. (Specified in body).
+                    <b>queryStatement</b> (string) <br>
+                    Any values specified in the query statement should be enclosed in single-quotes. (Specified in query).
                 </li>
         </ul>
 
@@ -1854,8 +1170,8 @@
                 <li>
                     <b>200</b>
                     <ul>
-                        <li>Description: An array of canceled notification&#39;s info.</li>
-                        <li>Schema: [<a href="#notification">Notification</a>]</li>
+                        <li>Description: An array of retrieved collection&#39;s info.</li>
+                        <li>Schema: [<a href="#entity">Entity</a>]</li>
                     </ul>
                 </li>
                 <li>
@@ -1873,16 +1189,16 @@
 
 <div class="panel panel-default">
     
-    <div class="panel-heading POST">
-        <h2 class="panel-title POST-heading">POST /{orgId}/{appId}/devices 
-            <a data-toggle="collapse" data-target="#collapse-oPXCIDKL6a"
-                href="#collapse-oPXCIDKL6a" class="collapsed collapse-button"> </a>
+    <div class="panel-heading PUT">
+        <h2 class="panel-title PUT-heading">PUT /{orgId}/{appId}/{collectionId} 
+            <a data-toggle="collapse" data-target="#collapse-5ueDq97AOE"
+                href="#collapse-5ueDq97AOE" class="collapsed collapse-button"> </a>
         </h2>
     </div>
     
-    <div id="collapse-oPXCIDKL6a" class="panel-body collapse">
+    <div id="collapse-5ueDq97AOE" class="panel-body collapse">
 
-        <p>Create notifications for user through targeting by location and providing all the identifications.</p>
+        <p>Update collection through query statement.</p>
 
         <h3>Parameters</h3>
 
@@ -1896,20 +1212,12 @@
                     One of the application&#39;s identification which includes name or uuid. (Specified in path).
                 </li>
                 <li>
-                    <b>notification</b> (                    <a href="#createnotifications">CreateNotifications</a>) <br>
-                    These parameters are used when forming the notification portion of the request. (Specified in body).
-                </li>
-                <li>
-                    <b>scheduleNotification</b> (                    <a href="#schedulenotification">ScheduleNotification</a>) <br>
-                    To schedule a notification for a later time add the deliver parameter with a UNIX timestamp to the body of your request. (Specified in body).
-                </li>
-                <li>
-                    <b>setExpiration</b> (                    <a href="#setexpiration">SetExpiration</a>) <br>
-                    If a push service can&#39;t deliver a message to a device and needs to resend it you can set a notification to expire after a certain date/time. (Specified in body).
+                    <b>collectionId</b> (string) <br>
+                    One of the collection&#39;s identification which includes name or uuid. (Specified in path).
                 </li>
                 <li>
-                    <b>queryStatement</b> () <br>
-                    The query statement of the location of the user. (Specified in query).
+                    <b>queryStatement</b> (string) <br>
+                    Any values specified in the query statement should be enclosed in single-quotes. (Specified in query).
                 </li>
         </ul>
 
@@ -1919,8 +1227,8 @@
                 <li>
                     <b>200</b>
                     <ul>
-                        <li>Description: An array of created notification&#39;s info.</li>
-                        <li>Schema: [<a href="#notification">Notification</a>]</li>
+                        <li>Description: An array of updated collection&#39;s info.</li>
+                        <li>Schema: [<a href="#entity">Entity</a>]</li>
                     </ul>
                 </li>
                 <li>
@@ -1939,15 +1247,15 @@
 <div class="panel panel-default">
     
     <div class="panel-heading POST">
-        <h2 class="panel-title POST-heading">POST /{orgId}/{appId}/devices/*/notifications 
-            <a data-toggle="collapse" data-target="#collapse-QHRHWLFRwh"
-                href="#collapse-QHRHWLFRwh" class="collapsed collapse-button"> </a>
+        <h2 class="panel-title POST-heading">POST /{orgId}/{appId}/{collectionId}/{entityId1}/{relation}/{entityId2} 
+            <a data-toggle="collapse" data-target="#collapse-dKuOHbhgMw"
+                href="#collapse-dKuOHbhgMw" class="collapsed collapse-button"> </a>
         </h2>
     </div>
     
-    <div id="collapse-QHRHWLFRwh" class="panel-body collapse">
+    <div id="collapse-dKuOHbhgMw" class="panel-body collapse">
 
-        <p>Create notifications for all devices. This request will target all device entities.</p>
+        <p>Add an entity to a collection through providing all the identifications.</p>
 
         <h3>Parameters</h3>
 
@@ -1961,16 +1269,20 @@
                     One of the application&#39;s identification which includes name or uuid. (Specified in path).
                 </li>
                 <li>
-                    <b>notification</b> (                    <a href="#createnotifications">CreateNotifications</a>) <br>
-                    These parameters are used when forming the notification portion of the request. (Specified in body).
+                    <b>collectionId</b> (string) <br>
+                    One of the collection&#39;s identification which includes name or uuid. (Specified in path).
+                </li>
+                <li>
+                    <b>entityId1</b> (string) <br>
+                    The Id of the 1st entity. (Specified in path).
                 </li>
                 <li>
-                    <b>scheduleNotification</b> (                    <a href="#schedulenotification">ScheduleNotification</a>) <br>
-                    To schedule a notification for a later time add the deliver parameter with a UNIX timestamp to the body of your request. (Specified in body).
+                    <b>relation</b> (string) <br>
+                    The relation between 1st entity and 2nd entity. (Specified in path).
                 </li>
                 <li>
-                    <b>setExpiration</b> (                    <a href="#setexpiration">SetExpiration</a>) <br>
-                    If a push service can&#39;t deliver a message to a device and needs to resend it you can set a notification to expire after a certain date/time. (Specified in body).
+                    <b>entityId2</b> (string) <br>
+                    The Id of the 2nd entity. (Specified in path).
                 </li>
         </ul>
 
@@ -1980,8 +1292,8 @@
                 <li>
                     <b>200</b>
                     <ul>
-                        <li>Description: An array of created notification&#39;s info.</li>
-                        <li>Schema: [<a href="#notification">Notification</a>]</li>
+                        <li>Description: An array of added entity&#39;s info.</li>
+                        <li>Schema: [<a href="#entity">Entity</a>]</li>
                     </ul>
                 </li>
                 <li>
@@ -1999,16 +1311,16 @@
 
 <div class="panel panel-default">
     
-    <div class="panel-heading POST">
-        <h2 class="panel-title POST-heading">POST /{orgId}/{appId}/devices/{deviceId}/notifications 
-            <a data-toggle="collapse" data-target="#collapse-YK5TdQKJ4Z"
-                href="#collapse-YK5TdQKJ4Z" class="collapsed collapse-button"> </a>
+    <div class="panel-heading DELETE">
+        <h2 class="panel-title DELETE-heading">DELETE /{orgId}/{appId}/{collectionId}/{entityId1}/{relation}/{entityId2} 
+            <a data-toggle="collapse" data-target="#collapse-0Db3hm26XC"
+                href="#collapse-0Db3hm26XC" class="collapsed collapse-button"> </a>
         </h2>
     </div>
     
-    <div id="collapse-YK5TdQKJ4Z" class="panel-body collapse">
+    <div id="collapse-0Db3hm26XC" class="panel-body collapse">
 
-        <p>Create notifications for a single device. This request will target a specific device entity.</p>
+        <p>Remove an entity from a collection through providing all the identifications.</p>
 
         <h3>Parameters</h3>
 
@@ -2022,20 +1334,20 @@
                     One of the application&#39;s identification which includes name or uuid. (Specified in path).
                 </li>
                 <li>
-                    <b>deviceId</b> (string) <br>
-                    One of the device&#39;s identification which includes name or uuid. (Specified in path).
+                    <b>collectionId</b> (string) <br>
+                    One of the collection&#39;s identification which includes name or uuid. (Specified in path).
                 </li>
                 <li>
-                    <b>notification</b> (                    <a href="#createnotifications">CreateNotifications</a>) <br>
-                    These parameters are used when forming the notification portion of the request. (Specified in body).
+                    <b>entityId1</b> (string) <br>
+                    The Id of the 1st entity. (Specified in path).
                 </li>
                 <li>
-                    <b>scheduleNotification</b> (                    <a href="#schedulenotification">ScheduleNotification</a>) <br>
-                    To schedule a notification for a later time add the deliver parameter with a UNIX timestamp to the body of your request. (Specified in body).
+                    <b>relation</b> (string) <br>
+                    The relation between 1st entity and 2nd entity. (Specified in path).
                 </li>
                 <li>
-                    <b>setExpiration</b> (                    <a href="#setexpiration">SetExpiration</a>) <br>
-                    If a push service can&#39;t deliver a message to a device and needs to resend it you can set a notification to expire after a certain date/time. (Specified in body).
+                    <b>entityId2</b> (string) <br>
+                    The Id of the 2nd entity. (Specified in path).
                 </li>
         </ul>
 
@@ -2045,8 +1357,8 @@
                 <li>
                     <b>200</b>
                     <ul>
-                        <li>Description: An array of created notification&#39;s info.</li>
-                        <li>Schema: [<a href="#notification">Notification</a>]</li>
+                        <li>Description: An array of deleted entity&#39;s info.</li>
+                        <li>Schema: [<a href="#entity">Entity</a>]</li>
                     </ul>
                 </li>
                 <li>
@@ -2064,16 +1376,16 @@
 
 <div class="panel panel-default">
     
-    <div class="panel-heading POST">
-        <h2 class="panel-title POST-heading">POST /{orgId}/{appId}/groups/{path}/notifications 
-            <a data-toggle="collapse" data-target="#collapse-ygcIRQJpNR"
-                href="#collapse-ygcIRQJpNR" class="collapsed collapse-button"> </a>
+    <div class="panel-heading GET">
+        <h2 class="panel-title GET-heading">GET /{orgId}/{appId}/{collectionId}/{entityId} 
+            <a data-toggle="collapse" data-target="#collapse-XcDzxtD3OE"
+                href="#collapse-XcDzxtD3OE" class="collapsed collapse-button"> </a>
         </h2>
     </div>
     
-    <div id="collapse-ygcIRQJpNR" class="panel-body collapse">
+    <div id="collapse-XcDzxtD3OE" class="panel-body collapse">
 
-        <p>Create notifications for a group. This request will target all users associated with a specific group entity.</p>
+        <p>Retrieve an entity through providing Id of application, organization, collection and entity.</p>
 
         <h3>Parameters</h3>
 
@@ -2087,20 +1399,12 @@
                     One of the application&#39;s identification which includes name or uuid. (Specified in path).
                 </li>
                 <li>
-                    <b>path</b> (string) <br>
-                    The path of the group. (Specified in path).
-                </li>
-                <li>
-                    <b>notification</b> (                    <a href="#createnotifications">CreateNotifications</a>) <br>
-                    These parameters are used when forming the notification portion of the request. (Specified in body).
-                </li>
-                <li>
-                    <b>scheduleNotification</b> (                    <a href="#schedulenotification">ScheduleNotification</a>) <br>
-                    To schedule a notification for a later time add the deliver parameter with a UNIX timestamp to the body of your request. (Specified in body).
+                    <b>collectionId</b> (string) <br>
+                    One of the collection&#39;s identification which includes name or uuid. (Specified in path).
                 </li>
                 <li>
-                    <b>setExpiration</b> (                    <a href="#setexpiration">SetExpiration</a>) <br>
-                    If a push service can&#39;t deliver a message to a device and needs to resend it you can set a notification to expire after a certain date/time. (Specified in body).
+                    <b>entityId</b> (string) <br>
+                    One of the entity&#39;s identification which includes name or uuid. (Specified in path).
                 </li>
         </ul>
 
@@ -2110,8 +1414,8 @@
                 <li>
                     <b>200</b>
                     <ul>
-                        <li>Description: An array of created notification&#39;s info.</li>
-                  

<TRUNCATED>

[32/60] [abbrv] incubator-usergrid git commit: cherry picking docs from master

[sn...@apache.org]

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_static/css/theme.css
----------------------------------------------------------------------
diff --git a/content/docs/_static/css/theme.css b/content/docs/_static/css/theme.css
new file mode 100644
index 0000000..870e633
--- /dev/null
+++ b/content/docs/_static/css/theme.css
@@ -0,0 +1,5514 @@
+* {
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box
+}
+
+article, aside, details, figcaption, figure, footer, header, hgroup, nav, section {
+    display: block
+}
+
+audio, canvas, video {
+    display: inline-block;
+    *display: inline;
+    *zoom: 1
+}
+
+audio:not([controls]) {
+    display: none
+}
+
+[hidden] {
+    display: none
+}
+
+* {
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box
+}
+
+html {
+    font-size: 100%;
+    -webkit-text-size-adjust: 100%;
+    -ms-text-size-adjust: 100%
+}
+
+body {
+    margin: 0
+}
+
+a:hover, a:active {
+    outline: 0
+}
+
+abbr[title] {
+    border-bottom: 1px dotted
+}
+
+b, strong {
+    font-weight: bold
+}
+
+blockquote {
+    margin: 0
+}
+
+dfn {
+    font-style: italic
+}
+
+ins {
+    background: #ff9;
+    color: #000;
+    text-decoration: none
+}
+
+mark {
+    background: #ff0;
+    color: #000;
+    font-style: italic;
+    font-weight: bold
+}
+
+pre, code, .rst-content tt, .rst-content code, kbd, samp {
+    font-family: monospace, serif;
+    _font-family: "courier new", monospace;
+    font-size: 1em
+}
+
+pre {
+    white-space: pre
+}
+
+q {
+    quotes: none
+}
+
+q:before, q:after {
+    content: "";
+    content: none
+}
+
+small {
+    font-size: 85%
+}
+
+sub, sup {
+    font-size: 75%;
+    line-height: 0;
+    position: relative;
+    vertical-align: baseline
+}
+
+sup {
+    top: -0.5em
+}
+
+sub {
+    bottom: -0.25em
+}
+
+ul, ol, dl {
+    margin: 0;
+    padding: 0;
+    list-style: none;
+    list-style-image: none
+}
+
+li {
+    list-style: none
+}
+
+dd {
+    margin: 0
+}
+
+img {
+    border: 0;
+    -ms-interpolation-mode: bicubic;
+    vertical-align: middle;
+    max-width: 100%
+}
+
+svg:not(:root) {
+    overflow: hidden
+}
+
+figure {
+    margin: 0
+}
+
+form {
+    margin: 0
+}
+
+fieldset {
+    border: 0;
+    margin: 0;
+    padding: 0
+}
+
+label {
+    cursor: pointer
+}
+
+legend {
+    border: 0;
+    *margin-left: -7px;
+    padding: 0;
+    white-space: normal
+}
+
+button, input, select, textarea {
+    font-size: 100%;
+    margin: 0;
+    vertical-align: baseline;
+    *vertical-align: middle
+}
+
+button, input {
+    line-height: normal
+}
+
+button, input[type="button"], input[type="reset"], input[type="submit"] {
+    cursor: pointer;
+    -webkit-appearance: button;
+    *overflow: visible
+}
+
+button[disabled], input[disabled] {
+    cursor: default
+}
+
+input[type="checkbox"], input[type="radio"] {
+    box-sizing: border-box;
+    padding: 0;
+    *width: 13px;
+    *height: 13px
+}
+
+input[type="search"] {
+    -webkit-appearance: textfield;
+    -moz-box-sizing: content-box;
+    -webkit-box-sizing: content-box;
+    box-sizing: content-box
+}
+
+input[type="search"]::-webkit-search-decoration, input[type="search"]::-webkit-search-cancel-button {
+    -webkit-appearance: none
+}
+
+button::-moz-focus-inner, input::-moz-focus-inner {
+    border: 0;
+    padding: 0
+}
+
+textarea {
+    overflow: auto;
+    vertical-align: top;
+    resize: vertical
+}
+
+table {
+    border-collapse: collapse;
+    border-spacing: 0
+}
+
+td {
+    vertical-align: top
+}
+
+.chromeframe {
+    margin: 0.2em 0;
+    background: #ccc;
+    color: #000;
+    padding: 0.2em 0
+}
+
+.ir {
+    display: block;
+    border: 0;
+    text-indent: -999em;
+    overflow: hidden;
+    background-color: transparent;
+    background-repeat: no-repeat;
+    text-align: left;
+    direction: ltr;
+    *line-height: 0
+}
+
+.ir br {
+    display: none
+}
+
+.hidden {
+    display: none !important;
+    visibility: hidden
+}
+
+.visuallyhidden {
+    border: 0;
+    clip: rect(0 0 0 0);
+    height: 1px;
+    margin: -1px;
+    overflow: hidden;
+    padding: 0;
+    position: absolute;
+    width: 1px
+}
+
+.visuallyhidden.focusable:active, .visuallyhidden.focusable:focus {
+    clip: auto;
+    height: auto;
+    margin: 0;
+    overflow: visible;
+    position: static;
+    width: auto
+}
+
+.invisible {
+    visibility: hidden
+}
+
+.relative {
+    position: relative
+}
+
+big, small {
+    font-size: 100%
+}
+
+@media print {
+    html, body, section {
+        background: none !important
+    }
+
+    * {
+        box-shadow: none !important;
+        text-shadow: none !important;
+        filter: none !important;
+        -ms-filter: none !important
+    }
+
+    a, a:visited {
+        text-decoration: underline
+    }
+
+    .ir a:after, a[href^="javascript:"]:after, a[href^="#"]:after {
+        content: ""
+    }
+
+    pre, blockquote {
+        page-break-inside: avoid
+    }
+
+    thead {
+        display: table-header-group
+    }
+
+    tr, img {
+        page-break-inside: avoid
+    }
+
+    img {
+        max-width: 100% !important
+    }
+
+    @page {
+        margin: 0.5cm
+    }
+
+    p, h2, .rst-content .toctree-wrapper p.caption, h3 {
+        orphans: 3;
+        widows: 3
+    }
+
+    h2, .rst-content .toctree-wrapper p.caption, h3 {
+        page-break-after: avoid
+    }
+}
+
+.fa:before, .wy-menu-vertical li span.toctree-expand:before, .wy-menu-vertical li.on a span.toctree-expand:before, .wy-menu-vertical li.current > a span.toctree-expand:before, .rst-content .admonition-title:before, .rst-content h1 .headerlink:before, .rst-content h2 .headerlink:before, .rst-content h3 .headerlink:before, .rst-content h4 .headerlink:before, .rst-content h5 .headerlink:before, .rst-content h6 .headerlink:before, .rst-content dl dt .headerlink:before, .rst-content p.caption .headerlink:before, .rst-content tt.download span:first-child:before, .rst-content code.download span:first-child:before, .icon:before, .wy-dropdown .caret:before, .wy-inline-validate.wy-inline-validate-success .wy-input-context:before, .wy-inline-validate.wy-inline-validate-danger .wy-input-context:before, .wy-inline-validate.wy-inline-validate-warning .wy-input-context:before, .wy-inline-validate.wy-inline-validate-info .wy-input-context:before, .wy-alert, .rst-content .note, .rst-content .attenti
 on, .rst-content .caution, .rst-content .danger, .rst-content .error, .rst-content .hint, .rst-content .important, .rst-content .tip, .rst-content .warning, .rst-content .seealso, .rst-content .admonition-todo, .btn, input[type="text"], input[type="password"], input[type="email"], input[type="url"], input[type="date"], input[type="month"], input[type="time"], input[type="datetime"], input[type="datetime-local"], input[type="week"], input[type="number"], input[type="search"], input[type="tel"], input[type="color"], select, textarea, .wy-menu-vertical li.on a, .wy-menu-vertical li.current > a, .wy-side-nav-search > a, .wy-side-nav-search .wy-dropdown > a, .wy-nav-top a {
+    -webkit-font-smoothing: antialiased
+}
+
+.clearfix {
+    *zoom: 1
+}
+
+.clearfix:before, .clearfix:after {
+    display: table;
+    content: ""
+}
+
+.clearfix:after {
+    clear: both
+}
+
+/*!
+ *  Font Awesome 4.2.0 by @davegandy - http://fontawesome.io - @fontawesome
+ *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
+ */
+@font-face {
+    font-family: 'FontAwesome';
+    src: url("../fonts/fontawesome-webfont.eot?v=4.2.0");
+    src: url("../fonts/fontawesome-webfont.eot?#iefix&v=4.2.0") format("embedded-opentype"), url("../fonts/fontawesome-webfont.woff?v=4.2.0") format("woff"), url("../fonts/fontawesome-webfont.ttf?v=4.2.0") format("truetype"), url("../fonts/fontawesome-webfont.svg?v=4.2.0#fontawesomeregular") format("svg");
+    font-weight: normal;
+    font-style: normal
+}
+
+.fa, .wy-menu-vertical li span.toctree-expand, .wy-menu-vertical li.on a span.toctree-expand, .wy-menu-vertical li.current > a span.toctree-expand, .rst-content .admonition-title, .rst-content h1 .headerlink, .rst-content h2 .headerlink, .rst-content h3 .headerlink, .rst-content h4 .headerlink, .rst-content h5 .headerlink, .rst-content h6 .headerlink, .rst-content dl dt .headerlink, .rst-content p.caption .headerlink, .rst-content tt.download span:first-child, .rst-content code.download span:first-child, .icon {
+    display: inline-block;
+    font: normal normal normal 14px/1 FontAwesome;
+    font-size: inherit;
+    text-rendering: auto;
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale
+}
+
+.fa-lg {
+    font-size: 1.33333em;
+    line-height: 0.75em;
+    vertical-align: -15%
+}
+
+.fa-2x {
+    font-size: 2em
+}
+
+.fa-3x {
+    font-size: 3em
+}
+
+.fa-4x {
+    font-size: 4em
+}
+
+.fa-5x {
+    font-size: 5em
+}
+
+.fa-fw {
+    width: 1.28571em;
+    text-align: center
+}
+
+.fa-ul {
+    padding-left: 0;
+    margin-left: 2.14286em;
+    list-style-type: none
+}
+
+.fa-ul > li {
+    position: relative
+}
+
+.fa-li {
+    position: absolute;
+    left: -2.14286em;
+    width: 2.14286em;
+    top: 0.14286em;
+    text-align: center
+}
+
+.fa-li.fa-lg {
+    left: -1.85714em
+}
+
+.fa-border {
+    padding: .2em .25em .15em;
+    border: solid 0.08em #eee;
+    border-radius: .1em
+}
+
+.pull-right {
+    float: right
+}
+
+.pull-left {
+    float: left
+}
+
+.fa.pull-left, .wy-menu-vertical li span.pull-left.toctree-expand, .wy-menu-vertical li.on a span.pull-left.toctree-expand, .wy-menu-vertical li.current > a span.pull-left.toctree-expand, .rst-content .pull-left.admonition-title, .rst-content h1 .pull-left.headerlink, .rst-content h2 .pull-left.headerlink, .rst-content h3 .pull-left.headerlink, .rst-content h4 .pull-left.headerlink, .rst-content h5 .pull-left.headerlink, .rst-content h6 .pull-left.headerlink, .rst-content dl dt .pull-left.headerlink, .rst-content p.caption .pull-left.headerlink, .rst-content tt.download span.pull-left:first-child, .rst-content code.download span.pull-left:first-child, .pull-left.icon {
+    margin-right: .3em
+}
+
+.fa.pull-right, .wy-menu-vertical li span.pull-right.toctree-expand, .wy-menu-vertical li.on a span.pull-right.toctree-expand, .wy-menu-vertical li.current > a span.pull-right.toctree-expand, .rst-content .pull-right.admonition-title, .rst-content h1 .pull-right.headerlink, .rst-content h2 .pull-right.headerlink, .rst-content h3 .pull-right.headerlink, .rst-content h4 .pull-right.headerlink, .rst-content h5 .pull-right.headerlink, .rst-content h6 .pull-right.headerlink, .rst-content dl dt .pull-right.headerlink, .rst-content p.caption .pull-right.headerlink, .rst-content tt.download span.pull-right:first-child, .rst-content code.download span.pull-right:first-child, .pull-right.icon {
+    margin-left: .3em
+}
+
+.fa-spin {
+    -webkit-animation: fa-spin 2s infinite linear;
+    animation: fa-spin 2s infinite linear
+}
+
+@-webkit-keyframes fa-spin {
+    0% {
+        -webkit-transform: rotate(0deg);
+        transform: rotate(0deg)
+    }
+    100% {
+        -webkit-transform: rotate(359deg);
+        transform: rotate(359deg)
+    }
+}
+
+@keyframes fa-spin {
+    0% {
+        -webkit-transform: rotate(0deg);
+        transform: rotate(0deg)
+    }
+    100% {
+        -webkit-transform: rotate(359deg);
+        transform: rotate(359deg)
+    }
+}
+
+.fa-rotate-90 {
+    filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1);
+    -webkit-transform: rotate(90deg);
+    -ms-transform: rotate(90deg);
+    transform: rotate(90deg)
+}
+
+.fa-rotate-180 {
+    filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2);
+    -webkit-transform: rotate(180deg);
+    -ms-transform: rotate(180deg);
+    transform: rotate(180deg)
+}
+
+.fa-rotate-270 {
+    filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3);
+    -webkit-transform: rotate(270deg);
+    -ms-transform: rotate(270deg);
+    transform: rotate(270deg)
+}
+
+.fa-flip-horizontal {
+    filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=0);
+    -webkit-transform: scale(-1, 1);
+    -ms-transform: scale(-1, 1);
+    transform: scale(-1, 1)
+}
+
+.fa-flip-vertical {
+    filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2);
+    -webkit-transform: scale(1, -1);
+    -ms-transform: scale(1, -1);
+    transform: scale(1, -1)
+}
+
+:root .fa-rotate-90, :root .fa-rotate-180, :root .fa-rotate-270, :root .fa-flip-horizontal, :root .fa-flip-vertical {
+    filter: none
+}
+
+.fa-stack {
+    position: relative;
+    display: inline-block;
+    width: 2em;
+    height: 2em;
+    line-height: 2em;
+    vertical-align: middle
+}
+
+.fa-stack-1x, .fa-stack-2x {
+    position: absolute;
+    left: 0;
+    width: 100%;
+    text-align: center
+}
+
+.fa-stack-1x {
+    line-height: inherit
+}
+
+.fa-stack-2x {
+    font-size: 2em
+}
+
+.fa-inverse {
+    color: #fff
+}
+
+.fa-glass:before {
+    content: ""
+}
+
+.fa-music:before {
+    content: ""
+}
+
+.fa-search:before, .icon-search:before {
+    content: ""
+}
+
+.fa-envelope-o:before {
+    content: ""
+}
+
+.fa-heart:before {
+    content: ""
+}
+
+.fa-star:before {
+    content: ""
+}
+
+.fa-star-o:before {
+    content: ""
+}
+
+.fa-user:before {
+    content: ""
+}
+
+.fa-film:before {
+    content: ""
+}
+
+.fa-th-large:before {
+    content: ""
+}
+
+.fa-th:before {
+    content: ""
+}
+
+.fa-th-list:before {
+    content: ""
+}
+
+.fa-check:before {
+    content: ""
+}
+
+.fa-remove:before, .fa-close:before, .fa-times:before {
+    content: ""
+}
+
+.fa-search-plus:before {
+    content: ""
+}
+
+.fa-search-minus:before {
+    content: ""
+}
+
+.fa-power-off:before {
+    content: ""
+}
+
+.fa-signal:before {
+    content: ""
+}
+
+.fa-gear:before, .fa-cog:before {
+    content: ""
+}
+
+.fa-trash-o:before {
+    content: ""
+}
+
+.fa-home:before, .icon-home:before {
+    content: ""
+}
+
+.fa-file-o:before {
+    content: ""
+}
+
+.fa-clock-o:before {
+    content: ""
+}
+
+.fa-road:before {
+    content: ""
+}
+
+.fa-download:before, .rst-content tt.download span:first-child:before, .rst-content code.download span:first-child:before {
+    content: ""
+}
+
+.fa-arrow-circle-o-down:before {
+    content: ""
+}
+
+.fa-arrow-circle-o-up:before {
+    content: ""
+}
+
+.fa-inbox:before {
+    content: ""
+}
+
+.fa-play-circle-o:before {
+    content: ""
+}
+
+.fa-rotate-right:before, .fa-repeat:before {
+    content: ""
+}
+
+.fa-refresh:before {
+    content: ""
+}
+
+.fa-list-alt:before {
+    content: ""
+}
+
+.fa-lock:before {
+    content: ""
+}
+
+.fa-flag:before {
+    content: ""
+}
+
+.fa-headphones:before {
+    content: ""
+}
+
+.fa-volume-off:before {
+    content: ""
+}
+
+.fa-volume-down:before {
+    content: ""
+}
+
+.fa-volume-up:before {
+    content: ""
+}
+
+.fa-qrcode:before {
+    content: ""
+}
+
+.fa-barcode:before {
+    content: ""
+}
+
+.fa-tag:before {
+    content: ""
+}
+
+.fa-tags:before {
+    content: ""
+}
+
+.fa-book:before, .icon-book:before {
+    content: ""
+}
+
+.fa-bookmark:before {
+    content: ""
+}
+
+.fa-print:before {
+    content: ""
+}
+
+.fa-camera:before {
+    content: ""
+}
+
+.fa-font:before {
+    content: ""
+}
+
+.fa-bold:before {
+    content: ""
+}
+
+.fa-italic:before {
+    content: ""
+}
+
+.fa-text-height:before {
+    content: ""
+}
+
+.fa-text-width:before {
+    content: ""
+}
+
+.fa-align-left:before {
+    content: ""
+}
+
+.fa-align-center:before {
+    content: ""
+}
+
+.fa-align-right:before {
+    content: ""
+}
+
+.fa-align-justify:before {
+    content: ""
+}
+
+.fa-list:before {
+    content: ""
+}
+
+.fa-dedent:before, .fa-outdent:before {
+    content: ""
+}
+
+.fa-indent:before {
+    content: ""
+}
+
+.fa-video-camera:before {
+    content: ""
+}
+
+.fa-photo:before, .fa-image:before, .fa-picture-o:before {
+    content: ""
+}
+
+.fa-pencil:before {
+    content: ""
+}
+
+.fa-map-marker:before {
+    content: ""
+}
+
+.fa-adjust:before {
+    content: ""
+}
+
+.fa-tint:before {
+    content: ""
+}
+
+.fa-edit:before, .fa-pencil-square-o:before {
+    content: ""
+}
+
+.fa-share-square-o:before {
+    content: ""
+}
+
+.fa-check-square-o:before {
+    content: ""
+}
+
+.fa-arrows:before {
+    content: ""
+}
+
+.fa-step-backward:before {
+    content: ""
+}
+
+.fa-fast-backward:before {
+    content: ""
+}
+
+.fa-backward:before {
+    content: ""
+}
+
+.fa-play:before {
+    content: ""
+}
+
+.fa-pause:before {
+    content: ""
+}
+
+.fa-stop:before {
+    content: ""
+}
+
+.fa-forward:before {
+    content: ""
+}
+
+.fa-fast-forward:before {
+    content: ""
+}
+
+.fa-step-forward:before {
+    content: ""
+}
+
+.fa-eject:before {
+    content: ""
+}
+
+.fa-chevron-left:before {
+    content: ""
+}
+
+.fa-chevron-right:before {
+    content: ""
+}
+
+.fa-plus-circle:before {
+    content: ""
+}
+
+.fa-minus-circle:before {
+    content: ""
+}
+
+.fa-times-circle:before, .wy-inline-validate.wy-inline-validate-danger .wy-input-context:before {
+    content: ""
+}
+
+.fa-check-circle:before, .wy-inline-validate.wy-inline-validate-success .wy-input-context:before {
+    content: ""
+}
+
+.fa-question-circle:before {
+    content: ""
+}
+
+.fa-info-circle:before {
+    content: ""
+}
+
+.fa-crosshairs:before {
+    content: ""
+}
+
+.fa-times-circle-o:before {
+    content: ""
+}
+
+.fa-check-circle-o:before {
+    content: ""
+}
+
+.fa-ban:before {
+    content: ""
+}
+
+.fa-arrow-left:before {
+    content: ""
+}
+
+.fa-arrow-right:before {
+    content: ""
+}
+
+.fa-arrow-up:before {
+    content: ""
+}
+
+.fa-arrow-down:before {
+    content: ""
+}
+
+.fa-mail-forward:before, .fa-share:before {
+    content: ""
+}
+
+.fa-expand:before {
+    content: ""
+}
+
+.fa-compress:before {
+    content: ""
+}
+
+.fa-plus:before {
+    content: ""
+}
+
+.fa-minus:before {
+    content: ""
+}
+
+.fa-asterisk:before {
+    content: ""
+}
+
+.fa-exclamation-circle:before, .wy-inline-validate.wy-inline-validate-warning .wy-input-context:before, .wy-inline-validate.wy-inline-validate-info .wy-input-context:before, .rst-content .admonition-title:before {
+    content: ""
+}
+
+.fa-gift:before {
+    content: ""
+}
+
+.fa-leaf:before {
+    content: ""
+}
+
+.fa-fire:before, .icon-fire:before {
+    content: ""
+}
+
+.fa-eye:before {
+    content: ""
+}
+
+.fa-eye-slash:before {
+    content: ""
+}
+
+.fa-warning:before, .fa-exclamation-triangle:before {
+    content: ""
+}
+
+.fa-plane:before {
+    content: ""
+}
+
+.fa-calendar:before {
+    content: ""
+}
+
+.fa-random:before {
+    content: ""
+}
+
+.fa-comment:before {
+    content: ""
+}
+
+.fa-magnet:before {
+    content: ""
+}
+
+.fa-chevron-up:before {
+    content: ""
+}
+
+.fa-chevron-down:before {
+    content: ""
+}
+
+.fa-retweet:before {
+    content: ""
+}
+
+.fa-shopping-cart:before {
+    content: ""
+}
+
+.fa-folder:before {
+    content: ""
+}
+
+.fa-folder-open:before {
+    content: ""
+}
+
+.fa-arrows-v:before {
+    content: ""
+}
+
+.fa-arrows-h:before {
+    content: ""
+}
+
+.fa-bar-chart-o:before, .fa-bar-chart:before {
+    content: ""
+}
+
+.fa-twitter-square:before {
+    content: ""
+}
+
+.fa-facebook-square:before {
+    content: ""
+}
+
+.fa-camera-retro:before {
+    content: ""
+}
+
+.fa-key:before {
+    content: ""
+}
+
+.fa-gears:before, .fa-cogs:before {
+    content: ""
+}
+
+.fa-comments:before {
+    content: ""
+}
+
+.fa-thumbs-o-up:before {
+    content: ""
+}
+
+.fa-thumbs-o-down:before {
+    content: ""
+}
+
+.fa-star-half:before {
+    content: ""
+}
+
+.fa-heart-o:before {
+    content: ""
+}
+
+.fa-sign-out:before {
+    content: ""
+}
+
+.fa-linkedin-square:before {
+    content: ""
+}
+
+.fa-thumb-tack:before {
+    content: ""
+}
+
+.fa-external-link:before {
+    content: ""
+}
+
+.fa-sign-in:before {
+    content: ""
+}
+
+.fa-trophy:before {
+    content: ""
+}
+
+.fa-github-square:before {
+    content: ""
+}
+
+.fa-upload:before {
+    content: ""
+}
+
+.fa-lemon-o:before {
+    content: ""
+}
+
+.fa-phone:before {
+    content: ""
+}
+
+.fa-square-o:before {
+    content: ""
+}
+
+.fa-bookmark-o:before {
+    content: ""
+}
+
+.fa-phone-square:before {
+    content: ""
+}
+
+.fa-twitter:before {
+    content: ""
+}
+
+.fa-facebook:before {
+    content: ""
+}
+
+.fa-github:before, .icon-github:before {
+    content: ""
+}
+
+.fa-unlock:before {
+    content: ""
+}
+
+.fa-credit-card:before {
+    content: ""
+}
+
+.fa-rss:before {
+    content: ""
+}
+
+.fa-hdd-o:before {
+    content: ""
+}
+
+.fa-bullhorn:before {
+    content: ""
+}
+
+.fa-bell:before {
+    content: ""
+}
+
+.fa-certificate:before {
+    content: ""
+}
+
+.fa-hand-o-right:before {
+    content: ""
+}
+
+.fa-hand-o-left:before {
+    content: ""
+}
+
+.fa-hand-o-up:before {
+    content: ""
+}
+
+.fa-hand-o-down:before {
+    content: ""
+}
+
+.fa-arrow-circle-left:before, .icon-circle-arrow-left:before {
+    content: ""
+}
+
+.fa-arrow-circle-right:before, .icon-circle-arrow-right:before {
+    content: ""
+}
+
+.fa-arrow-circle-up:before {
+    content: ""
+}
+
+.fa-arrow-circle-down:before {
+    content: ""
+}
+
+.fa-globe:before {
+    content: ""
+}
+
+.fa-wrench:before {
+    content: ""
+}
+
+.fa-tasks:before {
+    content: ""
+}
+
+.fa-filter:before {
+    content: ""
+}
+
+.fa-briefcase:before {
+    content: ""
+}
+
+.fa-arrows-alt:before {
+    content: ""
+}
+
+.fa-group:before, .fa-users:before {
+    content: ""
+}
+
+.fa-chain:before, .fa-link:before, .icon-link:before {
+    content: ""
+}
+
+.fa-cloud:before {
+    content: ""
+}
+
+.fa-flask:before {
+    content: ""
+}
+
+.fa-cut:before, .fa-scissors:before {
+    content: ""
+}
+
+.fa-copy:before, .fa-files-o:before {
+    content: ""
+}
+
+.fa-paperclip:before {
+    content: ""
+}
+
+.fa-save:before, .fa-floppy-o:before {
+    content: ""
+}
+
+.fa-square:before {
+    content: ""
+}
+
+.fa-navicon:before, .fa-reorder:before, .fa-bars:before {
+    content: ""
+}
+
+.fa-list-ul:before {
+    content: ""
+}
+
+.fa-list-ol:before {
+    content: ""
+}
+
+.fa-strikethrough:before {
+    content: ""
+}
+
+.fa-underline:before {
+    content: ""
+}
+
+.fa-table:before {
+    content: ""
+}
+
+.fa-magic:before {
+    content: ""
+}
+
+.fa-truck:before {
+    content: ""
+}
+
+.fa-pinterest:before {
+    content: ""
+}
+
+.fa-pinterest-square:before {
+    content: ""
+}
+
+.fa-google-plus-square:before {
+    content: ""
+}
+
+.fa-google-plus:before {
+    content: ""
+}
+
+.fa-money:before {
+    content: ""
+}
+
+.fa-caret-down:before, .wy-dropdown .caret:before, .icon-caret-down:before {
+    content: ""
+}
+
+.fa-caret-up:before {
+    content: ""
+}
+
+.fa-caret-left:before {
+    content: ""
+}
+
+.fa-caret-right:before {
+    content: ""
+}
+
+.fa-columns:before {
+    content: ""
+}
+
+.fa-unsorted:before, .fa-sort:before {
+    content: ""
+}
+
+.fa-sort-down:before, .fa-sort-desc:before {
+    content: ""
+}
+
+.fa-sort-up:before, .fa-sort-asc:before {
+    content: ""
+}
+
+.fa-envelope:before {
+    content: ""
+}
+
+.fa-linkedin:before {
+    content: ""
+}
+
+.fa-rotate-left:before, .fa-undo:before {
+    content: ""
+}
+
+.fa-legal:before, .fa-gavel:before {
+    content: ""
+}
+
+.fa-dashboard:before, .fa-tachometer:before {
+    content: ""
+}
+
+.fa-comment-o:before {
+    content: ""
+}
+
+.fa-comments-o:before {
+    content: ""
+}
+
+.fa-flash:before, .fa-bolt:before {
+    content: ""
+}
+
+.fa-sitemap:before {
+    content: ""
+}
+
+.fa-umbrella:before {
+    content: ""
+}
+
+.fa-paste:before, .fa-clipboard:before {
+    content: ""
+}
+
+.fa-lightbulb-o:before {
+    content: ""
+}
+
+.fa-exchange:before {
+    content: ""
+}
+
+.fa-cloud-download:before {
+    content: ""
+}
+
+.fa-cloud-upload:before {
+    content: ""
+}
+
+.fa-user-md:before {
+    content: ""
+}
+
+.fa-stethoscope:before {
+    content: ""
+}
+
+.fa-suitcase:before {
+    content: ""
+}
+
+.fa-bell-o:before {
+    content: ""
+}
+
+.fa-coffee:before {
+    content: ""
+}
+
+.fa-cutlery:before {
+    content: ""
+}
+
+.fa-file-text-o:before {
+    content: ""
+}
+
+.fa-building-o:before {
+    content: ""
+}
+
+.fa-hospital-o:before {
+    content: ""
+}
+
+.fa-ambulance:before {
+    content: ""
+}
+
+.fa-medkit:before {
+    content: ""
+}
+
+.fa-fighter-jet:before {
+    content: ""
+}
+
+.fa-beer:before {
+    content: ""
+}
+
+.fa-h-square:before {
+    content: ""
+}
+
+.fa-plus-square:before {
+    content: ""
+}
+
+.fa-angle-double-left:before {
+    content: ""
+}
+
+.fa-angle-double-right:before {
+    content: ""
+}
+
+.fa-angle-double-up:before {
+    content: ""
+}
+
+.fa-angle-double-down:before {
+    content: ""
+}
+
+.fa-angle-left:before {
+    content: ""
+}
+
+.fa-angle-right:before {
+    content: ""
+}
+
+.fa-angle-up:before {
+    content: ""
+}
+
+.fa-angle-down:before {
+    content: ""
+}
+
+.fa-desktop:before {
+    content: ""
+}
+
+.fa-laptop:before {
+    content: ""
+}
+
+.fa-tablet:before {
+    content: ""
+}
+
+.fa-mobile-phone:before, .fa-mobile:before {
+    content: ""
+}
+
+.fa-circle-o:before {
+    content: ""
+}
+
+.fa-quote-left:before {
+    content: ""
+}
+
+.fa-quote-right:before {
+    content: ""
+}
+
+.fa-spinner:before {
+    content: ""
+}
+
+.fa-circle:before {
+    content: ""
+}
+
+.fa-mail-reply:before, .fa-reply:before {
+    content: ""
+}
+
+.fa-github-alt:before {
+    content: ""
+}
+
+.fa-folder-o:before {
+    content: ""
+}
+
+.fa-folder-open-o:before {
+    content: ""
+}
+
+.fa-smile-o:before {
+    content: ""
+}
+
+.fa-frown-o:before {
+    content: ""
+}
+
+.fa-meh-o:before {
+    content: ""
+}
+
+.fa-gamepad:before {
+    content: ""
+}
+
+.fa-keyboard-o:before {
+    content: ""
+}
+
+.fa-flag-o:before {
+    content: ""
+}
+
+.fa-flag-checkered:before {
+    content: ""
+}
+
+.fa-terminal:before {
+    content: ""
+}
+
+.fa-code:before {
+    content: ""
+}
+
+.fa-mail-reply-all:before, .fa-reply-all:before {
+    content: ""
+}
+
+.fa-star-half-empty:before, .fa-star-half-full:before, .fa-star-half-o:before {
+    content: ""
+}
+
+.fa-location-arrow:before {
+    content: ""
+}
+
+.fa-crop:before {
+    content: ""
+}
+
+.fa-code-fork:before {
+    content: ""
+}
+
+.fa-unlink:before, .fa-chain-broken:before {
+    content: ""
+}
+
+.fa-question:before {
+    content: ""
+}
+
+.fa-info:before {
+    content: ""
+}
+
+.fa-exclamation:before {
+    content: ""
+}
+
+.fa-superscript:before {
+    content: ""
+}
+
+.fa-subscript:before {
+    content: ""
+}
+
+.fa-eraser:before {
+    content: ""
+}
+
+.fa-puzzle-piece:before {
+    content: ""
+}
+
+.fa-microphone:before {
+    content: ""
+}
+
+.fa-microphone-slash:before {
+    content: ""
+}
+
+.fa-shield:before {
+    content: ""
+}
+
+.fa-calendar-o:before {
+    content: ""
+}
+
+.fa-fire-extinguisher:before {
+    content: ""
+}
+
+.fa-rocket:before {
+    content: ""
+}
+
+.fa-maxcdn:before {
+    content: ""
+}
+
+.fa-chevron-circle-left:before {
+    content: ""
+}
+
+.fa-chevron-circle-right:before {
+    content: ""
+}
+
+.fa-chevron-circle-up:before {
+    content: ""
+}
+
+.fa-chevron-circle-down:before {
+    content: ""
+}
+
+.fa-html5:before {
+    content: ""
+}
+
+.fa-css3:before {
+    content: ""
+}
+
+.fa-anchor:before {
+    content: ""
+}
+
+.fa-unlock-alt:before {
+    content: ""
+}
+
+.fa-bullseye:before {
+    content: ""
+}
+
+.fa-ellipsis-h:before {
+    content: ""
+}
+
+.fa-ellipsis-v:before {
+    content: ""
+}
+
+.fa-rss-square:before {
+    content: ""
+}
+
+.fa-play-circle:before {
+    content: ""
+}
+
+.fa-ticket:before {
+    content: ""
+}
+
+.fa-minus-square:before {
+    content: ""
+}
+
+.fa-minus-square-o:before, .wy-menu-vertical li.on a span.toctree-expand:before, .wy-menu-vertical li.current > a span.toctree-expand:before {
+    content: ""
+}
+
+.fa-level-up:before {
+    content: ""
+}
+
+.fa-level-down:before {
+    content: ""
+}
+
+.fa-check-square:before {
+    content: ""
+}
+
+.fa-pencil-square:before {
+    content: ""
+}
+
+.fa-external-link-square:before {
+    content: ""
+}
+
+.fa-share-square:before {
+    content: ""
+}
+
+.fa-compass:before {
+    content: ""
+}
+
+.fa-toggle-down:before, .fa-caret-square-o-down:before {
+    content: ""
+}
+
+.fa-toggle-up:before, .fa-caret-square-o-up:before {
+    content: ""
+}
+
+.fa-toggle-right:before, .fa-caret-square-o-right:before {
+    content: ""
+}
+
+.fa-euro:before, .fa-eur:before {
+    content: ""
+}
+
+.fa-gbp:before {
+    content: ""
+}
+
+.fa-dollar:before, .fa-usd:before {
+    content: ""
+}
+
+.fa-rupee:before, .fa-inr:before {
+    content: ""
+}
+
+.fa-cny:before, .fa-rmb:before, .fa-yen:before, .fa-jpy:before {
+    content: ""
+}
+
+.fa-ruble:before, .fa-rouble:before, .fa-rub:before {
+    content: ""
+}
+
+.fa-won:before, .fa-krw:before {
+    content: ""
+}
+
+.fa-bitcoin:before, .fa-btc:before {
+    content: ""
+}
+
+.fa-file:before {
+    content: ""
+}
+
+.fa-file-text:before {
+    content: ""
+}
+
+.fa-sort-alpha-asc:before {
+    content: ""
+}
+
+.fa-sort-alpha-desc:before {
+    content: ""
+}
+
+.fa-sort-amount-asc:before {
+    content: ""
+}
+
+.fa-sort-amount-desc:before {
+    content: ""
+}
+
+.fa-sort-numeric-asc:before {
+    content: ""
+}
+
+.fa-sort-numeric-desc:before {
+    content: ""
+}
+
+.fa-thumbs-up:before {
+    content: ""
+}
+
+.fa-thumbs-down:before {
+    content: ""
+}
+
+.fa-youtube-square:before {
+    content: ""
+}
+
+.fa-youtube:before {
+    content: ""
+}
+
+.fa-xing:before {
+    content: ""
+}
+
+.fa-xing-square:before {
+    content: ""
+}
+
+.fa-youtube-play:before {
+    content: ""
+}
+
+.fa-dropbox:before {
+    content: ""
+}
+
+.fa-stack-overflow:before {
+    content: ""
+}
+
+.fa-instagram:before {
+    content: ""
+}
+
+.fa-flickr:before {
+    content: ""
+}
+
+.fa-adn:before {
+    content: ""
+}
+
+.fa-bitbucket:before, .icon-bitbucket:before {
+    content: ""
+}
+
+.fa-bitbucket-square:before {
+    content: ""
+}
+
+.fa-tumblr:before {
+    content: ""
+}
+
+.fa-tumblr-square:before {
+    content: ""
+}
+
+.fa-long-arrow-down:before {
+    content: ""
+}
+
+.fa-long-arrow-up:before {
+    content: ""
+}
+
+.fa-long-arrow-left:before {
+    content: ""
+}
+
+.fa-long-arrow-right:before {
+    content: ""
+}
+
+.fa-apple:before {
+    content: ""
+}
+
+.fa-windows:before {
+    content: ""
+}
+
+.fa-android:before {
+    content: ""
+}
+
+.fa-linux:before {
+    content: ""
+}
+
+.fa-dribbble:before {
+    content: ""
+}
+
+.fa-skype:before {
+    content: ""
+}
+
+.fa-foursquare:before {
+    content: ""
+}
+
+.fa-trello:before {
+    content: ""
+}
+
+.fa-female:before {
+    content: ""
+}
+
+.fa-male:before {
+    content: ""
+}
+
+.fa-gittip:before {
+    content: ""
+}
+
+.fa-sun-o:before {
+    content: ""
+}
+
+.fa-moon-o:before {
+    content: ""
+}
+
+.fa-archive:before {
+    content: ""
+}
+
+.fa-bug:before {
+    content: ""
+}
+
+.fa-vk:before {
+    content: ""
+}
+
+.fa-weibo:before {
+    content: ""
+}
+
+.fa-renren:before {
+    content: ""
+}
+
+.fa-pagelines:before {
+    content: ""
+}
+
+.fa-stack-exchange:before {
+    content: ""
+}
+
+.fa-arrow-circle-o-right:before {
+    content: ""
+}
+
+.fa-arrow-circle-o-left:before {
+    content: ""
+}
+
+.fa-toggle-left:before, .fa-caret-square-o-left:before {
+    content: ""
+}
+
+.fa-dot-circle-o:before {
+    content: ""
+}
+
+.fa-wheelchair:before {
+    content: ""
+}
+
+.fa-vimeo-square:before {
+    content: ""
+}
+
+.fa-turkish-lira:before, .fa-try:before {
+    content: ""
+}
+
+.fa-plus-square-o:before, .wy-menu-vertical li span.toctree-expand:before {
+    content: ""
+}
+
+.fa-space-shuttle:before {
+    content: ""
+}
+
+.fa-slack:before {
+    content: ""
+}
+
+.fa-envelope-square:before {
+    content: ""
+}
+
+.fa-wordpress:before {
+    content: ""
+}
+
+.fa-openid:before {
+    content: ""
+}
+
+.fa-institution:before, .fa-bank:before, .fa-university:before {
+    content: ""
+}
+
+.fa-mortar-board:before, .fa-graduation-cap:before {
+    content: ""
+}
+
+.fa-yahoo:before {
+    content: ""
+}
+
+.fa-google:before {
+    content: ""
+}
+
+.fa-reddit:before {
+    content: ""
+}
+
+.fa-reddit-square:before {
+    content: ""
+}
+
+.fa-stumbleupon-circle:before {
+    content: ""
+}
+
+.fa-stumbleupon:before {
+    content: ""
+}
+
+.fa-delicious:before {
+    content: ""
+}
+
+.fa-digg:before {
+    content: ""
+}
+
+.fa-pied-piper:before {
+    content: ""
+}
+
+.fa-pied-piper-alt:before {
+    content: ""
+}
+
+.fa-drupal:before {
+    content: ""
+}
+
+.fa-joomla:before {
+    content: ""
+}
+
+.fa-language:before {
+    content: ""
+}
+
+.fa-fax:before {
+    content: ""
+}
+
+.fa-building:before {
+    content: ""
+}
+
+.fa-child:before {
+    content: ""
+}
+
+.fa-paw:before {
+    content: ""
+}
+
+.fa-spoon:before {
+    content: ""
+}
+
+.fa-cube:before {
+    content: ""
+}
+
+.fa-cubes:before {
+    content: ""
+}
+
+.fa-behance:before {
+    content: ""
+}
+
+.fa-behance-square:before {
+    content: ""
+}
+
+.fa-steam:before {
+    content: ""
+}
+
+.fa-steam-square:before {
+    content: ""
+}
+
+.fa-recycle:before {
+    content: ""
+}
+
+.fa-automobile:before, .fa-car:before {
+    content: ""
+}
+
+.fa-cab:before, .fa-taxi:before {
+    content: ""
+}
+
+.fa-tree:before {
+    content: ""
+}
+
+.fa-spotify:before {
+    content: ""
+}
+
+.fa-deviantart:before {
+    content: ""
+}
+
+.fa-soundcloud:before {
+    content: ""
+}
+
+.fa-database:before {
+    content: ""
+}
+
+.fa-file-pdf-o:before {
+    content: ""
+}
+
+.fa-file-word-o:before {
+    content: ""
+}
+
+.fa-file-excel-o:before {
+    content: ""
+}
+
+.fa-file-powerpoint-o:before {
+    content: ""
+}
+
+.fa-file-photo-o:before, .fa-file-picture-o:before, .fa-file-image-o:before {
+    content: ""
+}
+
+.fa-file-zip-o:before, .fa-file-archive-o:before {
+    content: ""
+}
+
+.fa-file-sound-o:before, .fa-file-audio-o:before {
+    content: ""
+}
+
+.fa-file-movie-o:before, .fa-file-video-o:before {
+    content: ""
+}
+
+.fa-file-code-o:before {
+    content: ""
+}
+
+.fa-vine:before {
+    content: ""
+}
+
+.fa-codepen:before {
+    content: ""
+}
+
+.fa-jsfiddle:before {
+    content: ""
+}
+
+.fa-life-bouy:before, .fa-life-buoy:before, .fa-life-saver:before, .fa-support:before, .fa-life-ring:before {
+    content: ""
+}
+
+.fa-circle-o-notch:before {
+    content: ""
+}
+
+.fa-ra:before, .fa-rebel:before {
+    content: ""
+}
+
+.fa-ge:before, .fa-empire:before {
+    content: ""
+}
+
+.fa-git-square:before {
+    content: ""
+}
+
+.fa-git:before {
+    content: ""
+}
+
+.fa-hacker-news:before {
+    content: ""
+}
+
+.fa-tencent-weibo:before {
+    content: ""
+}
+
+.fa-qq:before {
+    content: ""
+}
+
+.fa-wechat:before, .fa-weixin:before {
+    content: ""
+}
+
+.fa-send:before, .fa-paper-plane:before {
+    content: ""
+}
+
+.fa-send-o:before, .fa-paper-plane-o:before {
+    content: ""
+}
+
+.fa-history:before {
+    content: ""
+}
+
+.fa-circle-thin:before {
+    content: ""
+}
+
+.fa-header:before {
+    content: ""
+}
+
+.fa-paragraph:before {
+    content: ""
+}
+
+.fa-sliders:before {
+    content: ""
+}
+
+.fa-share-alt:before {
+    content: ""
+}
+
+.fa-share-alt-square:before {
+    content: ""
+}
+
+.fa-bomb:before {
+    content: ""
+}
+
+.fa-soccer-ball-o:before, .fa-futbol-o:before {
+    content: ""
+}
+
+.fa-tty:before {
+    content: ""
+}
+
+.fa-binoculars:before {
+    content: ""
+}
+
+.fa-plug:before {
+    content: ""
+}
+
+.fa-slideshare:before {
+    content: ""
+}
+
+.fa-twitch:before {
+    content: ""
+}
+
+.fa-yelp:before {
+    content: ""
+}
+
+.fa-newspaper-o:before {
+    content: ""
+}
+
+.fa-wifi:before {
+    content: ""
+}
+
+.fa-calculator:before {
+    content: ""
+}
+
+.fa-paypal:before {
+    content: ""
+}
+
+.fa-google-wallet:before {
+    content: ""
+}
+
+.fa-cc-visa:before {
+    content: ""
+}
+
+.fa-cc-mastercard:before {
+    content: ""
+}
+
+.fa-cc-discover:before {
+    content: ""
+}
+
+.fa-cc-amex:before {
+    content: ""
+}
+
+.fa-cc-paypal:before {
+    content: ""
+}
+
+.fa-cc-stripe:before {
+    content: ""
+}
+
+.fa-bell-slash:before {
+    content: ""
+}
+
+.fa-bell-slash-o:before {
+    content: ""
+}
+
+.fa-trash:before {
+    content: ""
+}
+
+.fa-copyright:before {
+    content: ""
+}
+
+.fa-at:before {
+    content: ""
+}
+
+.fa-eyedropper:before {
+    content: ""
+}
+
+.fa-paint-brush:before {
+    content: ""
+}
+
+.fa-birthday-cake:before {
+    content: ""
+}
+
+.fa-area-chart:before {
+    content: ""
+}
+
+.fa-pie-chart:before {
+    content: ""
+}
+
+.fa-line-chart:before {
+    content: ""
+}
+
+.fa-lastfm:before {
+    content: ""
+}
+
+.fa-lastfm-square:before {
+    content: ""
+}
+
+.fa-toggle-off:before {
+    content: ""
+}
+
+.fa-toggle-on:before {
+    content: ""
+}
+
+.fa-bicycle:before {
+    content: ""
+}
+
+.fa-bus:before {
+    content: ""
+}
+
+.fa-ioxhost:before {
+    content: ""
+}
+
+.fa-angellist:before {
+    content: ""
+}
+
+.fa-cc:before {
+    content: ""
+}
+
+.fa-shekel:before, .fa-sheqel:before, .fa-ils:before {
+    content: ""
+}
+
+.fa-meanpath:before {
+    content: ""
+}
+
+.fa, .wy-menu-vertical li span.toctree-expand, .wy-menu-vertical li.on a span.toctree-expand, .wy-menu-vertical li.current > a span.toctree-expand, .rst-content .admonition-title, .rst-content h1 .headerlink, .rst-content h2 .headerlink, .rst-content h3 .headerlink, .rst-content h4 .headerlink, .rst-content h5 .headerlink, .rst-content h6 .headerlink, .rst-content dl dt .headerlink, .rst-content p.caption .headerlink, .rst-content tt.download span:first-child, .rst-content code.download span:first-child, .icon, .wy-dropdown .caret, .wy-inline-validate.wy-inline-validate-success .wy-input-context, .wy-inline-validate.wy-inline-validate-danger .wy-input-context, .wy-inline-validate.wy-inline-validate-warning .wy-input-context, .wy-inline-validate.wy-inline-validate-info .wy-input-context {
+    font-family: inherit
+}
+
+.fa:before, .wy-menu-vertical li span.toctree-expand:before, .wy-menu-vertical li.on a span.toctree-expand:before, .wy-menu-vertical li.current > a span.toctree-expand:before, .rst-content .admonition-title:before, .rst-content h1 .headerlink:before, .rst-content h2 .headerlink:before, .rst-content h3 .headerlink:before, .rst-content h4 .headerlink:before, .rst-content h5 .headerlink:before, .rst-content h6 .headerlink:before, .rst-content dl dt .headerlink:before, .rst-content p.caption .headerlink:before, .rst-content tt.download span:first-child:before, .rst-content code.download span:first-child:before, .icon:before, .wy-dropdown .caret:before, .wy-inline-validate.wy-inline-validate-success .wy-input-context:before, .wy-inline-validate.wy-inline-validate-danger .wy-input-context:before, .wy-inline-validate.wy-inline-validate-warning .wy-input-context:before, .wy-inline-validate.wy-inline-validate-info .wy-input-context:before {
+    font-family: "FontAwesome";
+    display: inline-block;
+    font-style: normal;
+    font-weight: normal;
+    line-height: 1;
+    text-decoration: inherit
+}
+
+a .fa, a .wy-menu-vertical li span.toctree-expand, .wy-menu-vertical li a span.toctree-expand, .wy-menu-vertical li.on a span.toctree-expand, .wy-menu-vertical li.current > a span.toctree-expand, a .rst-content .admonition-title, .rst-content a .admonition-title, a .rst-content h1 .headerlink, .rst-content h1 a .headerlink, a .rst-content h2 .headerlink, .rst-content h2 a .headerlink, a .rst-content h3 .headerlink, .rst-content h3 a .headerlink, a .rst-content h4 .headerlink, .rst-content h4 a .headerlink, a .rst-content h5 .headerlink, .rst-content h5 a .headerlink, a .rst-content h6 .headerlink, .rst-content h6 a .headerlink, a .rst-content dl dt .headerlink, .rst-content dl dt a .headerlink, a .rst-content p.caption .headerlink, .rst-content p.caption a .headerlink, a .rst-content tt.download span:first-child, .rst-content tt.download a span:first-child, a .rst-content code.download span:first-child, .rst-content code.download a span:first-child, a .icon {
+    display: inline-block;
+    text-decoration: inherit
+}
+
+.btn .fa, .btn .wy-menu-vertical li span.toctree-expand, .wy-menu-vertical li .btn span.toctree-expand, .btn .wy-menu-vertical li.on a span.toctree-expand, .wy-menu-vertical li.on a .btn span.toctree-expand, .btn .wy-menu-vertical li.current > a span.toctree-expand, .wy-menu-vertical li.current > a .btn span.toctree-expand, .btn .rst-content .admonition-title, .rst-content .btn .admonition-title, .btn .rst-content h1 .headerlink, .rst-content h1 .btn .headerlink, .btn .rst-content h2 .headerlink, .rst-content h2 .btn .headerlink, .btn .rst-content h3 .headerlink, .rst-content h3 .btn .headerlink, .btn .rst-content h4 .headerlink, .rst-content h4 .btn .headerlink, .btn .rst-content h5 .headerlink, .rst-content h5 .btn .headerlink, .btn .rst-content h6 .headerlink, .rst-content h6 .btn .headerlink, .btn .rst-content dl dt .headerlink, .rst-content dl dt .btn .headerlink, .btn .rst-content p.caption .headerlink, .rst-content p.caption .btn .headerlink, .btn .rst-content tt.download spa
 n:first-child, .rst-content tt.download .btn span:first-child, .btn .rst-content code.download span:first-child, .rst-content code.download .btn span:first-child, .btn .icon, .nav .fa, .nav .wy-menu-vertical li span.toctree-expand, .wy-menu-vertical li .nav span.toctree-expand, .nav .wy-menu-vertical li.on a span.toctree-expand, .wy-menu-vertical li.on a .nav span.toctree-expand, .nav .wy-menu-vertical li.current > a span.toctree-expand, .wy-menu-vertical li.current > a .nav span.toctree-expand, .nav .rst-content .admonition-title, .rst-content .nav .admonition-title, .nav .rst-content h1 .headerlink, .rst-content h1 .nav .headerlink, .nav .rst-content h2 .headerlink, .rst-content h2 .nav .headerlink, .nav .rst-content h3 .headerlink, .rst-content h3 .nav .headerlink, .nav .rst-content h4 .headerlink, .rst-content h4 .nav .headerlink, .nav .rst-content h5 .headerlink, .rst-content h5 .nav .headerlink, .nav .rst-content h6 .headerlink, .rst-content h6 .nav .headerlink, .nav .rst-cont
 ent dl dt .headerlink, .rst-content dl dt .nav .headerlink, .nav .rst-content p.caption .headerlink, .rst-content p.caption .nav .headerlink, .nav .rst-content tt.download span:first-child, .rst-content tt.download .nav span:first-child, .nav .rst-content code.download span:first-child, .rst-content code.download .nav span:first-child, .nav .icon {
+    display: inline
+}
+
+.btn .fa.fa-large, .btn .wy-menu-vertical li span.fa-large.toctree-expand, .wy-menu-vertical li .btn span.fa-large.toctree-expand, .btn .rst-content .fa-large.admonition-title, .rst-content .btn .fa-large.admonition-title, .btn .rst-content h1 .fa-large.headerlink, .rst-content h1 .btn .fa-large.headerlink, .btn .rst-content h2 .fa-large.headerlink, .rst-content h2 .btn .fa-large.headerlink, .btn .rst-content h3 .fa-large.headerlink, .rst-content h3 .btn .fa-large.headerlink, .btn .rst-content h4 .fa-large.headerlink, .rst-content h4 .btn .fa-large.headerlink, .btn .rst-content h5 .fa-large.headerlink, .rst-content h5 .btn .fa-large.headerlink, .btn .rst-content h6 .fa-large.headerlink, .rst-content h6 .btn .fa-large.headerlink, .btn .rst-content dl dt .fa-large.headerlink, .rst-content dl dt .btn .fa-large.headerlink, .btn .rst-content p.caption .fa-large.headerlink, .rst-content p.caption .btn .fa-large.headerlink, .btn .rst-content tt.download span.fa-large:first-child, .rst-cont
 ent tt.download .btn span.fa-large:first-child, .btn .rst-content code.download span.fa-large:first-child, .rst-content code.download .btn span.fa-large:first-child, .btn .fa-large.icon, .nav .fa.fa-large, .nav .wy-menu-vertical li span.fa-large.toctree-expand, .wy-menu-vertical li .nav span.fa-large.toctree-expand, .nav .rst-content .fa-large.admonition-title, .rst-content .nav .fa-large.admonition-title, .nav .rst-content h1 .fa-large.headerlink, .rst-content h1 .nav .fa-large.headerlink, .nav .rst-content h2 .fa-large.headerlink, .rst-content h2 .nav .fa-large.headerlink, .nav .rst-content h3 .fa-large.headerlink, .rst-content h3 .nav .fa-large.headerlink, .nav .rst-content h4 .fa-large.headerlink, .rst-content h4 .nav .fa-large.headerlink, .nav .rst-content h5 .fa-large.headerlink, .rst-content h5 .nav .fa-large.headerlink, .nav .rst-content h6 .fa-large.headerlink, .rst-content h6 .nav .fa-large.headerlink, .nav .rst-content dl dt .fa-large.headerlink, .rst-content dl dt .nav .
 fa-large.headerlink, .nav .rst-content p.caption .fa-large.headerlink, .rst-content p.caption .nav .fa-large.headerlink, .nav .rst-content tt.download span.fa-large:first-child, .rst-content tt.download .nav span.fa-large:first-child, .nav .rst-content code.download span.fa-large:first-child, .rst-content code.download .nav span.fa-large:first-child, .nav .fa-large.icon {
+    line-height: 0.9em
+}
+
+.btn .fa.fa-spin, .btn .wy-menu-vertical li span.fa-spin.toctree-expand, .wy-menu-vertical li .btn span.fa-spin.toctree-expand, .btn .rst-content .fa-spin.admonition-title, .rst-content .btn .fa-spin.admonition-title, .btn .rst-content h1 .fa-spin.headerlink, .rst-content h1 .btn .fa-spin.headerlink, .btn .rst-content h2 .fa-spin.headerlink, .rst-content h2 .btn .fa-spin.headerlink, .btn .rst-content h3 .fa-spin.headerlink, .rst-content h3 .btn .fa-spin.headerlink, .btn .rst-content h4 .fa-spin.headerlink, .rst-content h4 .btn .fa-spin.headerlink, .btn .rst-content h5 .fa-spin.headerlink, .rst-content h5 .btn .fa-spin.headerlink, .btn .rst-content h6 .fa-spin.headerlink, .rst-content h6 .btn .fa-spin.headerlink, .btn .rst-content dl dt .fa-spin.headerlink, .rst-content dl dt .btn .fa-spin.headerlink, .btn .rst-content p.caption .fa-spin.headerlink, .rst-content p.caption .btn .fa-spin.headerlink, .btn .rst-content tt.download span.fa-spin:first-child, .rst-content tt.download .btn s
 pan.fa-spin:first-child, .btn .rst-content code.download span.fa-spin:first-child, .rst-content code.download .btn span.fa-spin:first-child, .btn .fa-spin.icon, .nav .fa.fa-spin, .nav .wy-menu-vertical li span.fa-spin.toctree-expand, .wy-menu-vertical li .nav span.fa-spin.toctree-expand, .nav .rst-content .fa-spin.admonition-title, .rst-content .nav .fa-spin.admonition-title, .nav .rst-content h1 .fa-spin.headerlink, .rst-content h1 .nav .fa-spin.headerlink, .nav .rst-content h2 .fa-spin.headerlink, .rst-content h2 .nav .fa-spin.headerlink, .nav .rst-content h3 .fa-spin.headerlink, .rst-content h3 .nav .fa-spin.headerlink, .nav .rst-content h4 .fa-spin.headerlink, .rst-content h4 .nav .fa-spin.headerlink, .nav .rst-content h5 .fa-spin.headerlink, .rst-content h5 .nav .fa-spin.headerlink, .nav .rst-content h6 .fa-spin.headerlink, .rst-content h6 .nav .fa-spin.headerlink, .nav .rst-content dl dt .fa-spin.headerlink, .rst-content dl dt .nav .fa-spin.headerlink, .nav .rst-content p.capt
 ion .fa-spin.headerlink, .rst-content p.caption .nav .fa-spin.headerlink, .nav .rst-content tt.download span.fa-spin:first-child, .rst-content tt.download .nav span.fa-spin:first-child, .nav .rst-content code.download span.fa-spin:first-child, .rst-content code.download .nav span.fa-spin:first-child, .nav .fa-spin.icon {
+    display: inline-block
+}
+
+.btn.fa:before, .wy-menu-vertical li span.btn.toctree-expand:before, .rst-content .btn.admonition-title:before, .rst-content h1 .btn.headerlink:before, .rst-content h2 .btn.headerlink:before, .rst-content h3 .btn.headerlink:before, .rst-content h4 .btn.headerlink:before, .rst-content h5 .btn.headerlink:before, .rst-content h6 .btn.headerlink:before, .rst-content dl dt .btn.headerlink:before, .rst-content p.caption .btn.headerlink:before, .rst-content tt.download span.btn:first-child:before, .rst-content code.download span.btn:first-child:before, .btn.icon:before {
+    opacity: 0.5;
+    -webkit-transition: opacity 0.05s ease-in;
+    -moz-transition: opacity 0.05s ease-in;
+    transition: opacity 0.05s ease-in
+}
+
+.btn.fa:hover:before, .wy-menu-vertical li span.btn.toctree-expand:hover:before, .rst-content .btn.admonition-title:hover:before, .rst-content h1 .btn.headerlink:hover:before, .rst-content h2 .btn.headerlink:hover:before, .rst-content h3 .btn.headerlink:hover:before, .rst-content h4 .btn.headerlink:hover:before, .rst-content h5 .btn.headerlink:hover:before, .rst-content h6 .btn.headerlink:hover:before, .rst-content dl dt .btn.headerlink:hover:before, .rst-content p.caption .btn.headerlink:hover:before, .rst-content tt.download span.btn:first-child:hover:before, .rst-content code.download span.btn:first-child:hover:before, .btn.icon:hover:before {
+    opacity: 1
+}
+
+.btn-mini .fa:before, .btn-mini .wy-menu-vertical li span.toctree-expand:before, .wy-menu-vertical li .btn-mini span.toctree-expand:before, .btn-mini .rst-content .admonition-title:before, .rst-content .btn-mini .admonition-title:before, .btn-mini .rst-content h1 .headerlink:before, .rst-content h1 .btn-mini .headerlink:before, .btn-mini .rst-content h2 .headerlink:before, .rst-content h2 .btn-mini .headerlink:before, .btn-mini .rst-content h3 .headerlink:before, .rst-content h3 .btn-mini .headerlink:before, .btn-mini .rst-content h4 .headerlink:before, .rst-content h4 .btn-mini .headerlink:before, .btn-mini .rst-content h5 .headerlink:before, .rst-content h5 .btn-mini .headerlink:before, .btn-mini .rst-content h6 .headerlink:before, .rst-content h6 .btn-mini .headerlink:before, .btn-mini .rst-content dl dt .headerlink:before, .rst-content dl dt .btn-mini .headerlink:before, .btn-mini .rst-content p.caption .headerlink:before, .rst-content p.caption .btn-mini .headerlink:before, .bt
 n-mini .rst-content tt.download span:first-child:before, .rst-content tt.download .btn-mini span:first-child:before, .btn-mini .rst-content code.download span:first-child:before, .rst-content code.download .btn-mini span:first-child:before, .btn-mini .icon:before {
+    font-size: 14px;
+    vertical-align: -15%
+}
+
+.wy-alert, .rst-content .note, .rst-content .attention, .rst-content .caution, .rst-content .danger, .rst-content .error, .rst-content .hint, .rst-content .important, .rst-content .tip, .rst-content .warning, .rst-content .seealso, .rst-content .admonition-todo {
+    padding: 12px;
+    line-height: 24px;
+    margin-bottom: 24px;
+    background: #e7f2fa
+}
+
+.wy-alert-title, .rst-content .admonition-title {
+    color: #fff;
+    font-weight: bold;
+    display: block;
+    color: #fff;
+    background: #6ab0de;
+    margin: -12px;
+    padding: 6px 12px;
+    margin-bottom: 12px
+}
+
+.wy-alert.wy-alert-danger, .rst-content .wy-alert-danger.note, .rst-content .wy-alert-danger.attention, .rst-content .wy-alert-danger.caution, .rst-content .danger, .rst-content .error, .rst-content .wy-alert-danger.hint, .rst-content .wy-alert-danger.important, .rst-content .wy-alert-danger.tip, .rst-content .wy-alert-danger.warning, .rst-content .wy-alert-danger.seealso, .rst-content .wy-alert-danger.admonition-todo {
+    background: #fdf3f2
+}
+
+.wy-alert.wy-alert-danger .wy-alert-title, .rst-content .wy-alert-danger.note .wy-alert-title, .rst-content .wy-alert-danger.attention .wy-alert-title, .rst-content .wy-alert-danger.caution .wy-alert-title, .rst-content .danger .wy-alert-title, .rst-content .error .wy-alert-title, .rst-content .wy-alert-danger.hint .wy-alert-title, .rst-content .wy-alert-danger.important .wy-alert-title, .rst-content .wy-alert-danger.tip .wy-alert-title, .rst-content .wy-alert-danger.warning .wy-alert-title, .rst-content .wy-alert-danger.seealso .wy-alert-title, .rst-content .wy-alert-danger.admonition-todo .wy-alert-title, .wy-alert.wy-alert-danger .rst-content .admonition-title, .rst-content .wy-alert.wy-alert-danger .admonition-title, .rst-content .wy-alert-danger.note .admonition-title, .rst-content .wy-alert-danger.attention .admonition-title, .rst-content .wy-alert-danger.caution .admonition-title, .rst-content .danger .admonition-title, .rst-content .error .admonition-title, .rst-content .wy-
 alert-danger.hint .admonition-title, .rst-content .wy-alert-danger.important .admonition-title, .rst-content .wy-alert-danger.tip .admonition-title, .rst-content .wy-alert-danger.warning .admonition-title, .rst-content .wy-alert-danger.seealso .admonition-title, .rst-content .wy-alert-danger.admonition-todo .admonition-title {
+    background: #f29f97
+}
+
+.wy-alert.wy-alert-warning, .rst-content .wy-alert-warning.note, .rst-content .attention, .rst-content .caution, .rst-content .wy-alert-warning.danger, .rst-content .wy-alert-warning.error, .rst-content .wy-alert-warning.hint, .rst-content .wy-alert-warning.important, .rst-content .wy-alert-warning.tip, .rst-content .warning, .rst-content .wy-alert-warning.seealso, .rst-content .admonition-todo {
+    background: #ffedcc
+}
+
+.wy-alert.wy-alert-warning .wy-alert-title, .rst-content .wy-alert-warning.note .wy-alert-title, .rst-content .attention .wy-alert-title, .rst-content .caution .wy-alert-title, .rst-content .wy-alert-warning.danger .wy-alert-title, .rst-content .wy-alert-warning.error .wy-alert-title, .rst-content .wy-alert-warning.hint .wy-alert-title, .rst-content .wy-alert-warning.important .wy-alert-title, .rst-content .wy-alert-warning.tip .wy-alert-title, .rst-content .warning .wy-alert-title, .rst-content .wy-alert-warning.seealso .wy-alert-title, .rst-content .admonition-todo .wy-alert-title, .wy-alert.wy-alert-warning .rst-content .admonition-title, .rst-content .wy-alert.wy-alert-warning .admonition-title, .rst-content .wy-alert-warning.note .admonition-title, .rst-content .attention .admonition-title, .rst-content .caution .admonition-title, .rst-content .wy-alert-warning.danger .admonition-title, .rst-content .wy-alert-warning.error .admonition-title, .rst-content .wy-alert-warning.hint 
 .admonition-title, .rst-content .wy-alert-warning.important .admonition-title, .rst-content .wy-alert-warning.tip .admonition-title, .rst-content .warning .admonition-title, .rst-content .wy-alert-warning.seealso .admonition-title, .rst-content .admonition-todo .admonition-title {
+    background: #f0b37e
+}
+
+.wy-alert.wy-alert-info, .rst-content .note, .rst-content .wy-alert-info.attention, .rst-content .wy-alert-info.caution, .rst-content .wy-alert-info.danger, .rst-content .wy-alert-info.error, .rst-content .wy-alert-info.hint, .rst-content .wy-alert-info.important, .rst-content .wy-alert-info.tip, .rst-content .wy-alert-info.warning, .rst-content .seealso, .rst-content .wy-alert-info.admonition-todo {
+    background: #e7f2fa
+}
+
+.wy-alert.wy-alert-info .wy-alert-title, .rst-content .note .wy-alert-title, .rst-content .wy-alert-info.attention .wy-alert-title, .rst-content .wy-alert-info.caution .wy-alert-title, .rst-content .wy-alert-info.danger .wy-alert-title, .rst-content .wy-alert-info.error .wy-alert-title, .rst-content .wy-alert-info.hint .wy-alert-title, .rst-content .wy-alert-info.important .wy-alert-title, .rst-content .wy-alert-info.tip .wy-alert-title, .rst-content .wy-alert-info.warning .wy-alert-title, .rst-content .seealso .wy-alert-title, .rst-content .wy-alert-info.admonition-todo .wy-alert-title, .wy-alert.wy-alert-info .rst-content .admonition-title, .rst-content .wy-alert.wy-alert-info .admonition-title, .rst-content .note .admonition-title, .rst-content .wy-alert-info.attention .admonition-title, .rst-content .wy-alert-info.caution .admonition-title, .rst-content .wy-alert-info.danger .admonition-title, .rst-content .wy-alert-info.error .admonition-title, .rst-content .wy-alert-info.hint 
 .admonition-title, .rst-content .wy-alert-info.important .admonition-title, .rst-content .wy-alert-info.tip .admonition-title, .rst-content .wy-alert-info.warning .admonition-title, .rst-content .seealso .admonition-title, .rst-content .wy-alert-info.admonition-todo .admonition-title {
+    background: #6ab0de
+}
+
+.wy-alert.wy-alert-success, .rst-content .wy-alert-success.note, .rst-content .wy-alert-success.attention, .rst-content .wy-alert-success.caution, .rst-content .wy-alert-success.danger, .rst-content .wy-alert-success.error, .rst-content .hint, .rst-content .important, .rst-content .tip, .rst-content .wy-alert-success.warning, .rst-content .wy-alert-success.seealso, .rst-content .wy-alert-success.admonition-todo {
+    background: #dbfaf4
+}
+
+.wy-alert.wy-alert-success .wy-alert-title, .rst-content .wy-alert-success.note .wy-alert-title, .rst-content .wy-alert-success.attention .wy-alert-title, .rst-content .wy-alert-success.caution .wy-alert-title, .rst-content .wy-alert-success.danger .wy-alert-title, .rst-content .wy-alert-success.error .wy-alert-title, .rst-content .hint .wy-alert-title, .rst-content .important .wy-alert-title, .rst-content .tip .wy-alert-title, .rst-content .wy-alert-success.warning .wy-alert-title, .rst-content .wy-alert-success.seealso .wy-alert-title, .rst-content .wy-alert-success.admonition-todo .wy-alert-title, .wy-alert.wy-alert-success .rst-content .admonition-title, .rst-content .wy-alert.wy-alert-success .admonition-title, .rst-content .wy-alert-success.note .admonition-title, .rst-content .wy-alert-success.attention .admonition-title, .rst-content .wy-alert-success.caution .admonition-title, .rst-content .wy-alert-success.danger .admonition-title, .rst-content .wy-alert-success.error .adm
 onition-title, .rst-content .hint .admonition-title, .rst-content .important .admonition-title, .rst-content .tip .admonition-title, .rst-content .wy-alert-success.warning .admonition-title, .rst-content .wy-alert-success.seealso .admonition-title, .rst-content .wy-alert-success.admonition-todo .admonition-title {
+    background: #1abc9c
+}
+
+.wy-alert.wy-alert-neutral, .rst-content .wy-alert-neutral.note, .rst-content .wy-alert-neutral.attention, .rst-content .wy-alert-neutral.caution, .rst-content .wy-alert-neutral.danger, .rst-content .wy-alert-neutral.error, .rst-content .wy-alert-neutral.hint, .rst-content .wy-alert-neutral.important, .rst-content .wy-alert-neutral.tip, .rst-content .wy-alert-neutral.warning, .rst-content .wy-alert-neutral.seealso, .rst-content .wy-alert-neutral.admonition-todo {
+    background: #f3f6f6
+}
+
+.wy-alert.wy-alert-neutral .wy-alert-title, .rst-content .wy-alert-neutral.note .wy-alert-title, .rst-content .wy-alert-neutral.attention .wy-alert-title, .rst-content .wy-alert-neutral.caution .wy-alert-title, .rst-content .wy-alert-neutral.danger .wy-alert-title, .rst-content .wy-alert-neutral.error .wy-alert-title, .rst-content .wy-alert-neutral.hint .wy-alert-title, .rst-content .wy-alert-neutral.important .wy-alert-title, .rst-content .wy-alert-neutral.tip .wy-alert-title, .rst-content .wy-alert-neutral.warning .wy-alert-title, .rst-content .wy-alert-neutral.seealso .wy-alert-title, .rst-content .wy-alert-neutral.admonition-todo .wy-alert-title, .wy-alert.wy-alert-neutral .rst-content .admonition-title, .rst-content .wy-alert.wy-alert-neutral .admonition-title, .rst-content .wy-alert-neutral.note .admonition-title, .rst-content .wy-alert-neutral.attention .admonition-title, .rst-content .wy-alert-neutral.caution .admonition-title, .rst-content .wy-alert-neutral.danger .admoniti
 on-title, .rst-content .wy-alert-neutral.error .admonition-title, .rst-content .wy-alert-neutral.hint .admonition-title, .rst-content .wy-alert-neutral.important .admonition-title, .rst-content .wy-alert-neutral.tip .admonition-title, .rst-content .wy-alert-neutral.warning .admonition-title, .rst-content .wy-alert-neutral.seealso .admonition-title, .rst-content .wy-alert-neutral.admonition-todo .admonition-title {
+    color: #404040;
+    background: #e1e4e5
+}
+
+.wy-alert.wy-alert-neutral a, .rst-content .wy-alert-neutral.note a, .rst-content .wy-alert-neutral.attention a, .rst-content .wy-alert-neutral.caution a, .rst-content .wy-alert-neutral.danger a, .rst-content .wy-alert-neutral.error a, .rst-content .wy-alert-neutral.hint a, .rst-content .wy-alert-neutral.important a, .rst-content .wy-alert-neutral.tip a, .rst-content .wy-alert-neutral.warning a, .rst-content .wy-alert-neutral.seealso a, .rst-content .wy-alert-neutral.admonition-todo a {
+    color: #2980B9
+}
+
+.wy-alert p:last-child, .rst-content .note p:last-child, .rst-content .attention p:last-child, .rst-content .caution p:last-child, .rst-content .danger p:last-child, .rst-content .error p:last-child, .rst-content .hint p:last-child, .rst-content .important p:last-child, .rst-content .tip p:last-child, .rst-content .warning p:last-child, .rst-content .seealso p:last-child, .rst-content .admonition-todo p:last-child {
+    margin-bottom: 0
+}
+
+.wy-tray-container {
+    position: fixed;
+    bottom: 0px;
+    left: 0;
+    z-index: 600
+}
+
+.wy-tray-container li {
+    display: block;
+    width: 300px;
+    background: transparent;
+    color: #fff;
+    text-align: center;
+    box-shadow: 0 5px 5px 0 rgba(0, 0, 0, 0.1);
+    padding: 0 24px;
+    min-width: 20%;
+    opacity: 0;
+    height: 0;
+    line-height: 56px;
+    overflow: hidden;
+    -webkit-transition: all 0.3s ease-in;
+    -moz-transition: all 0.3s ease-in;
+    transition: all 0.3s ease-in
+}
+
+.wy-tray-container li.wy-tray-item-success {
+    background: #27AE60
+}
+
+.wy-tray-container li.wy-tray-item-info {
+    background: #2980B9
+}
+
+.wy-tray-container li.wy-tray-item-warning {
+    background: #E67E22
+}
+
+.wy-tray-container li.wy-tray-item-danger {
+    background: #E74C3C
+}
+
+.wy-tray-container li.on {
+    opacity: 1;
+    height: 56px
+}
+
+@media screen and (max-width: 768px) {
+    .wy-tray-container {
+        bottom: auto;
+        top: 0;
+        width: 100%
+    }
+
+    .wy-tray-container li {
+        width: 100%
+    }
+}
+
+button {
+    font-size: 100%;
+    margin: 0;
+    vertical-align: baseline;
+    *vertical-align: middle;
+    cursor: pointer;
+    line-height: normal;
+    -webkit-appearance: button;
+    *overflow: visible
+}
+
+button::-moz-focus-inner, input::-moz-focus-inner {
+    border: 0;
+    padding: 0
+}
+
+button[disabled] {
+    cursor: default
+}
+
+.btn {
+    display: inline-block;
+    border-radius: 2px;
+    line-height: normal;
+    white-space: nowrap;
+    text-align: center;
+    cursor: pointer;
+    font-size: 100%;
+    padding: 6px 12px 8px 12px;
+    color: #fff;
+    border: 1px solid rgba(0, 0, 0, 0.1);
+    background-color: #27AE60;
+    text-decoration: none;
+    font-weight: normal;
+    font-family: "Lato", "proxima-nova", "Helvetica Neue", Arial, sans-serif;
+    box-shadow: 0px 1px 2px -1px rgba(255, 255, 255, 0.5) inset, 0px -2px 0px 0px rgba(0, 0, 0, 0.1) inset;
+    outline-none: false;
+    vertical-align: middle;
+    *display: inline;
+    zoom: 1;
+    -webkit-user-drag: none;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+    -webkit-transition: all 0.1s linear;
+    -moz-transition: all 0.1s linear;
+    transition: all 0.1s linear
+}
+
+.btn-hover {
+    background: #2e8ece;
+    color: #fff
+}
+
+.btn:hover {
+    background: #2cc36b;
+    color: #fff
+}
+
+.btn:focus {
+    background: #2cc36b;
+    outline: 0
+}
+
+.btn:active {
+    box-shadow: 0px -1px 0px 0px rgba(0, 0, 0, 0.05) inset, 0px 2px 0px 0px rgba(0, 0, 0, 0.1) inset;
+    padding: 8px 12px 6px 12px
+}
+
+.btn:visited {
+    color: #fff
+}
+
+.btn:disabled {
+    background-image: none;
+    filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+    filter: alpha(opacity=40);
+    opacity: 0.4;
+    cursor: not-allowed;
+    box-shadow: none
+}
+
+.btn-disabled {
+    background-image: none;
+    filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+    filter: alpha(opacity=40);
+    opacity: 0.4;
+    cursor: not-allowed;
+    box-shadow: none
+}
+
+.btn-disabled:hover, .btn-disabled:focus, .btn-disabled:active {
+    background-image: none;
+    filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+    filter: alpha(opacity=40);
+    opacity: 0.4;
+    cursor: not-allowed;
+    box-shadow: none
+}
+
+.btn::-moz-focus-inner {
+    padding: 0;
+    border: 0
+}
+
+.btn-small {
+    font-size: 80%
+}
+
+.btn-info {
+    background-color: #2980B9 !important
+}
+
+.btn-info:hover {
+    background-color: #2e8ece !important
+}
+
+.btn-neutral {
+    background-color: #f3f6f6 !important;
+    color: #404040 !important
+}
+
+.btn-neutral:hover {
+    background-color: #e5ebeb !important;
+    color: #404040
+}
+
+.btn-neutral:visited {
+    color: #404040 !important
+}
+
+.btn-success {
+    background-color: #27AE60 !important
+}
+
+.btn-success:hover {
+    background-color: #295 !important
+}
+
+.btn-danger {
+    background-color: #E74C3C !important
+}
+
+.btn-danger:hover {
+    background-color: #ea6153 !important
+}
+
+.btn-warning {
+    background-color: #E67E22 !important
+}
+
+.btn-warning:hover {
+    background-color: #e98b39 !important
+}
+
+.btn-invert {
+    background-color: #222
+}
+
+.btn-invert:hover {
+    background-color: #2f2f2f !important
+}
+
+.btn-link {
+    background-color: transparent !important;
+    color: #2980B9;
+    box-shadow: none;
+    border-color: transparent !important
+}
+
+.btn-link:hover {
+    background-color: transparent !important;
+    color: #409ad5 !important;
+    box-shadow: none
+}
+
+.btn-link:active {
+    background-color: transparent !important;
+    color: #409ad5 !important;
+    box-shadow: none
+}
+
+.btn-link:visited {
+    color: #9B59B6
+}
+
+.wy-btn-group .btn, .wy-control .btn {
+    vertical-align: middle
+}
+
+.wy-btn-group {
+    margin-bottom: 24px;
+    *zoom: 1
+}
+
+.wy-btn-group:before, .wy-btn-group:after {
+    display: table;
+    content: ""
+}
+
+.wy-btn-group:after {
+    clear: both
+}
+
+.wy-dropdown {
+    position: relative;
+    display: inline-block
+}
+
+.wy-dropdown-active .wy-dropdown-menu {
+    display: block
+}
+
+.wy-dropdown-menu {
+    position: absolute;
+    left: 0;
+    display: none;
+    float: left;
+    top: 100%;
+    min-width: 100%;
+    background: #fcfcfc;
+    z-index: 100;
+    border: solid 1px #cfd7dd;
+    box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.1);
+    padding: 12px
+}
+
+.wy-dropdown-menu > dd > a {
+    display: block;
+    clear: both;
+    color: #404040;
+    white-space: nowrap;
+    font-size: 90%;
+    padding: 0 12px;
+    cursor: pointer
+}
+
+.wy-dropdown-menu > dd > a:hover {
+    background: #2980B9;
+    color: #fff
+}
+
+.wy-dropdown-menu > dd.divider {
+    border-top: solid 1px #cfd7dd;
+    margin: 6px 0
+}
+
+.wy-dropdown-menu > dd.search {
+    padding-bottom: 12px
+}
+
+.wy-dropdown-menu > dd.search input[type="search"] {
+    width: 100%
+}
+
+.wy-dropdown-menu > dd.call-to-action {
+    background: #e3e3e3;
+    text-transform: uppercase;
+    font-weight: 500;
+    font-size: 80%
+}
+
+.wy-dropdown-menu > dd.call-to-action:hover {
+    background: #e3e3e3
+}
+
+.wy-dropdown-menu > dd.call-to-action .btn {
+    color: #fff
+}
+
+.wy-dropdown.wy-dropdown-up .wy-dropdown-menu {
+    bottom: 100%;
+    top: auto;
+    left: auto;
+    right: 0
+}
+
+.wy-dropdown.wy-dropdown-bubble .wy-dropdown-menu {
+    background: #fcfcfc;
+    margin-top: 2px
+}
+
+.wy-dropdown.wy-dropdown-bubble .wy-dropdown-menu a {
+    padding: 6px 12px
+}
+
+.wy-dropdown.wy-dropdown-bubble .wy-dropdown-menu a:hover {
+    background: #2980B9;
+    color: #fff
+}
+
+.wy-dropdown.wy-dropdown-left .wy-dropdown-menu {
+    right: 0;
+    left: auto;
+    text-align: right
+}
+
+.wy-dropdown-arrow:before {
+    content: " ";
+    border-bottom: 5px solid #f5f5f5;
+    border-left: 5px solid transparent;
+    border-right: 5px solid transparent;
+    position: absolute;
+    display: block;
+    top: -4px;
+    left: 50%;
+    margin-left: -3px
+}
+
+.wy-dropdown-arrow.wy-dropdown-arrow-left:before {
+    left: 11px
+}
+
+.wy-form-stacked select {
+    display: block
+}
+
+.wy-form-aligned input, .wy-form-aligned textarea, .wy-form-aligned select, .wy-form-aligned .wy-help-inline, .wy-form-aligned label {
+    display: inline-block;
+    *display: inline;
+    *zoom: 1;
+    vertical-align: middle
+}
+
+.wy-form-aligned .wy-control-group > label {
+    display: inline-block;
+    vertical-align: middle;
+    width: 10em;
+    margin: 6px 12px 0 0;
+    float: left
+}
+
+.wy-form-aligned .wy-control {
+    float: left
+}
+
+.wy-form-aligned .wy-control label {
+    display: block
+}
+
+.wy-form-aligned .wy-control select {
+    margin-top: 6px
+}
+
+fieldset {
+    border: 0;
+    margin: 0;
+    padding: 0
+}
+
+legend {
+    display: block;
+    width: 100%;
+    border: 0;
+    padding: 0;
+    white-space: normal;
+    margin-bottom: 24px;
+    font-size: 150%;
+    *margin-left: -7px
+}
+
+label {
+    display: block;
+    margin: 0 0 0.3125em 0;
+    color: #333;
+    font-size: 90%
+}
+
+input, select, textarea {
+    font-size: 100%;
+    margin: 0;
+    vertical-align: baseline;
+    *vertical-align: middle
+}
+
+.wy-control-group {
+    margin-bottom: 24px;
+    *zoom: 1;
+    max-width: 68em;
+    margin-left: auto;
+    margin-right: auto;
+    *zoom: 1
+}
+
+.wy-control-group:before, .wy-control-group:after {
+    display: table;
+    content: ""
+}
+
+.wy-control-group:after {
+    clear: both
+}
+
+.wy-control-group:before, .wy-control-group:after {
+    display: table;
+    content: ""
+}
+
+.wy-control-group:after {
+    clear: both
+}
+
+.wy-control-group.wy-control-group-required > label:after {
+    content: " *";
+    color: #E74C3C
+}
+
+.wy-control-group .wy-form-full, .wy-control-group .wy-form-halves, .wy-control-group .wy-form-thirds {
+    padding-bottom: 12px
+}
+
+.wy-control-group .wy-form-full select, .wy-control-group .wy-form-halves select, .wy-control-group .wy-form-thirds select {
+    width: 100%
+}
+
+.wy-control-group .wy-form-full input[type="text"], .wy-control-group .wy-form-full input[type="password"], .wy-control-group .wy-form-full input[type="email"], .wy-control-group .wy-form-full input[type="url"], .wy-control-group .wy-form-full input[type="date"], .wy-control-group .wy-form-full input[type="month"], .wy-control-group .wy-form-full input[type="time"], .wy-control-group .wy-form-full input[type="datetime"], .wy-control-group .wy-form-full input[type="datetime-local"], .wy-control-group .wy-form-full input[type="week"], .wy-control-group .wy-form-full input[type="number"], .wy-control-group .wy-form-full input[type="search"], .wy-control-group .wy-form-full input[type="tel"], .wy-control-group .wy-form-full input[type="color"], .wy-control-group .wy-form-halves input[type="text"], .wy-control-group .wy-form-halves input[type="password"], .wy-control-group .wy-form-halves input[type="email"], .wy-control-group .wy-form-halves input[type="url"], .wy-control-group .wy-form
 -halves input[type="date"], .wy-control-group .wy-form-halves input[type="month"], .wy-control-group .wy-form-halves input[type="time"], .wy-control-group .wy-form-halves input[type="datetime"], .wy-control-group .wy-form-halves input[type="datetime-local"], .wy-control-group .wy-form-halves input[type="week"], .wy-control-group .wy-form-halves input[type="number"], .wy-control-group .wy-form-halves input[type="search"], .wy-control-group .wy-form-halves input[type="tel"], .wy-control-group .wy-form-halves input[type="color"], .wy-control-group .wy-form-thirds input[type="text"], .wy-control-group .wy-form-thirds input[type="password"], .wy-control-group .wy-form-thirds input[type="email"], .wy-control-group .wy-form-thirds input[type="url"], .wy-control-group .wy-form-thirds input[type="date"], .wy-control-group .wy-form-thirds input[type="month"], .wy-control-group .wy-form-thirds input[type="time"], .wy-control-group .wy-form-thirds input[type="datetime"], .wy-control-group .wy-f
 orm-thirds input[type="datetime-local"], .wy-control-group .wy-form-thirds input[type="week"], .wy-control-group .wy-form-thirds input[type="number"], .wy-control-group .wy-form-thirds input[type="search"], .wy-control-group .wy-form-thirds input[type="tel"], .wy-control-group .wy-form-thirds input[type="color"] {
+    width: 100%
+}
+
+.wy-control-group .wy-form-full {
+    float: left;
+    display: block;
+    margin-right: 2.35765%;
+    width: 100%;
+    margin-right: 0
+}
+
+.wy-control-group .wy-form-full:last-child {
+    margin-right: 0
+}
+
+.wy-control-group .wy-form-halves {
+    float: left;
+    display: block;
+    margin-right: 2.35765%;
+    width: 48.82117%
+}
+
+.wy-control-group .wy-form-halves:last-child {
+    margin-right: 0
+}
+
+.wy-control-group .wy-form-halves:nth-of-type(2n) {
+    margin-right: 0
+}
+
+.wy-control-group .wy-form-halves:nth-of-type(2n+1) {
+    clear: left
+}
+
+.wy-control-group .wy-form-thirds {
+    float: left;
+    display: block;
+    margin-right: 2.35765%;
+    width: 31.76157%
+}
+
+.wy-control-group .wy-form-thirds:last-child {
+    margin-right: 0
+}
+
+.wy-control-group .wy-form-thirds:nth-of-type(3n) {
+    margin-right: 0
+}
+
+.wy-control-group .wy-form-thirds:nth-of-type(3n+1) {
+    clear: left
+}
+
+.wy-control-group.wy-control-group-no-input .wy-control {
+    margin: 6px 0 0 0;
+    font-size: 90%
+}
+
+.wy-control-no-input {
+    display: inline-block;
+    margin: 6px 0 0 0;
+    font-size: 90%
+}
+
+.wy-control-group.fluid-input input[type="text"], .wy-control-group.fluid-input input[type="password"], .wy-control-group.fluid-input input[type="email"], .wy-control-group.fluid-input input[type="url"], .wy-control-group.fluid-input input[type="date"], .wy-control-group.fluid-input input[type="month"], .wy-control-group.fluid-input input[type="time"], .wy-control-group.fluid-input input[type="datetime"], .wy-control-group.fluid-input input[type="datetime-local"], .wy-control-group.fluid-input input[type="week"], .wy-control-group.fluid-input input[type="number"], .wy-control-group.fluid-input input[type="search"], .wy-control-group.fluid-input input[type="tel"], .wy-control-group.fluid-input input[type="color"] {
+    width: 100%
+}
+
+.wy-form-message-inline {
+    display: inline-block;
+    padding-left: 0.3em;
+    color: #666;
+    vertical-align: middle;
+    font-size: 90%
+}
+
+.wy-form-message {
+    display: block;
+    color: #999;
+    font-size: 70%;
+    margin-top: 0.3125em;
+    font-style: italic
+}
+
+.wy-form-message p {
+    font-size: inherit;
+    font-style: italic;
+    margin-bottom: 6px
+}
+
+.wy-form-message p:last-child {
+    margin-bottom: 0
+}
+
+input {
+    line-height: normal
+}
+
+input[type="button"], input[type="reset"], input[type="submit"] {
+    -webkit-appearance: button;
+    cursor: pointer;
+    font-family: "Lato", "proxima-nova", "Helvetica Neue", Arial, sans-serif;
+    *overflow: visible
+}
+
+input[type="text"], input[type="password"], input[type="email"], input[type="url"], input[type="date"], input[type="month"], input[type="time"], input[type="datetime"], input[type="datetime-local"], input[type="week"], input[type="number"], input[type="search"], input[type="tel"], input[type="color"] {
+    -webkit-appearance: none;
+    padding: 6px;
+    display: inline-block;
+    border: 1px solid #ccc;
+    font-size: 80%;
+    font-family: "Lato", "proxima-nova", "Helvetica Neue", Arial, sans-serif;
+    box-shadow: inset 0 1px 3px #ddd;
+    border-radius: 0;
+    -webkit-transition: border 0.3s linear;
+    -moz-transition: border 0.3s linear;
+    transition: border 0.3s linear
+}
+
+input[type="datetime-local"] {
+    padding: 0.34375em 0.625em
+}
+
+input[disabled] {
+    cursor: default
+}
+
+input[type="checkbox"], input[type="radio"] {
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
+    padding: 0;
+    margin-right: 0.3125em;
+    *height: 13px;
+    *width: 13px
+}
+
+input[type="search"] {
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box
+}
+
+input[type="search"]::-webkit-search-cancel-button, input[type="search"]::-webkit-search-decoration {
+    -webkit-appearance: none
+}
+
+input[type="text"]:focus, input[type="password"]:focus, input[type="email"]:focus, input[type="url"]:focus, input[type="date"]:focus, input[type="month"]:focus, input[type="time"]:focus, input[type="datetime"]:focus, input[type="datetime-local"]:focus, input[type="week"]:focus, input[type="number"]:focus, input[type="search"]:focus, input[type="tel"]:focus, input[type="color"]:focus {
+    outline: 0;
+    outline: thin dotted \9;
+    border-color: #333
+}
+
+input.no-focus:focus {
+    border-color: #ccc !important
+}
+
+input[type="file"]:focus, input[type="radio"]:focus, input[type="checkbox"]:focus {
+    outline: thin dotted #333;
+    outline: 1px auto #129FEA
+}
+
+input[type="text"][disabled], input[type="password"][disabled], input[type="email"][disabled], input[type="url"][disabled], input[type="date"][disabled], input[type="month"][disabled], input[type="time"][disabled], input[type="datetime"][disabled], input[type="datetime-local"][disabled], input[type="week"][disabled], input[type="number"][disabled], input[type="search"][disabled], input[type="tel"][disabled], input[type="color"][disabled] {
+    cursor: not-allowed;
+    background-color: #fafafa
+}
+
+input:focus:invalid, textarea:focus:invalid, select:focus:invalid {
+    color: #E74C3C;
+    border: 1px solid #E74C3C
+}
+
+input:focus:invalid:focus, textarea:focus:invalid:focus, select:focus:invalid:focus {
+    border-color: #E74C3C
+}
+
+input[type="file"]:focus:invalid:focus, input[type="radio"]:focus:invalid:focus, input[type="checkbox"]:focus:invalid:focus {
+    outline-color: #E74C3C
+}
+
+input.wy-input-large {
+    padding: 12px;
+    font-size: 100%
+}
+
+textarea {
+    overflow: auto;
+    vertical-align: top;
+    width: 100%;
+    font-family: "Lato", "proxima-nova", "Helvetica Neue", Arial, sans-serif
+}
+
+select, textarea {
+    padding: 0.5em 0.625em;
+    display: inline-block;
+    border: 1px solid #ccc;
+    font-size: 80%;
+    box-shadow: inset 0 1px 3px #ddd;
+    -webkit-transition: border 0.3s linear;
+    -moz-transition: border 0.3s linear;
+    transition: border 0.3s linear
+}
+
+select {
+    border: 1px solid #ccc;
+    background-color: #fff
+}
+
+select[multiple] {
+    height: auto
+}
+
+select:focus, textarea:focus {
+    outline: 0
+}
+
+select[disabled], textarea[disabled], input[readonly], select[readonly], textarea[readonly] {
+    cursor: not-allowed;
+    background-color: #fafafa
+}
+
+input[type="radio"][disabled], input[type="checkbox"][disabled] {
+    cursor: not-allowed
+}
+
+.wy-checkbox, .wy-radio {
+    margin: 6px 0;
+    color: #404040;
+    display: block
+}
+
+.wy-checkbox input, .wy-radio input {
+    vertical-align: baseline
+}
+
+.wy-form-message-inline {
+    display: inline-block;
+    *display: inline;
+    *zoom: 1;
+    vertical-align: middle
+}
+
+.wy-input-prefix, .wy-input-suffix {
+    white-space: nowrap;
+    padding: 6px
+}
+
+.wy-input-prefix .wy-input-context, .wy-input-suffix .wy-input-context {
+    line-height: 27px;
+    padding: 0 8px;
+    display: inline-block;
+    font-size: 80%;
+    background-color: #f3f6f6;
+    border: solid 1px #ccc;
+    color: #999
+}
+
+.wy-input-suffix .wy-input-context {
+    border-left: 0
+}
+
+.wy-input-prefix .wy-input-context {
+    border-right: 0
+}
+
+.wy-switch {
+    width: 36px;
+    height: 12px;
+    margin: 12px 0;
+    position: relative;
+    border-radius: 4px;
+    background: #ccc;
+    cursor: pointer;
+    -webkit-transition: all 0.2s ease-in-out;
+    -moz-transition: all 0.2s ease-in-out;
+    transition: all 0.2s ease-in-out
+}
+
+.wy-switch:before {
+    position: absolute;
+    content: "";
+    display: block;
+    width: 18px;
+    height: 18px;
+    border-radius: 4px;
+    background: #999;
+    left: -3px;
+    top: -3px;
+    -webkit-transition: all 0.2s ease-in-out;
+    -moz-transition: all 0.2s ease-in-out;
+    transition: all 0.2s ease-in-out
+}
+
+.wy-switch:after {
+    content: "false";
+    position: absolute;
+    left: 48px;
+    display: block;
+    font-size: 12px;
+    color: #ccc
+}
+
+.wy-switch.active {
+    background: #1e8449
+}
+
+.wy-switch.active:before {
+    left: 24px;
+    background: #27AE60
+}
+
+.wy-switch.active:after {
+    content: "true"
+}
+
+.wy-switch.disabled, .wy-switch.active.disabled {
+    cursor: not-allowed
+}
+
+.wy-control-group.wy-control-group-error .wy-form-message, .wy-control-group.wy-control-group-error > label {
+    color: #E74C3C
+}
+
+.wy-control-group.wy-control-group-error input[type="text"], .wy-control-group.wy-control-group-error input[type="password"], .wy-control-group.wy-control-group-error input[type="email"], .wy-control-group.wy-control-group-error input[type="url"], .wy-control-group.wy-control-group-error input[type="date"], .wy-control-group.wy-control-group-error input[type="month"], .wy-control-group.wy-control-group-error input[type="time"], .wy-control-group.wy-control-group-error input[type="datetime"], .wy-control-group.wy-control-group-error input[type="datetime-local"], .wy-control-group.wy-control-group-error input[type="week"], .wy-control-group.wy-control-group-error input[type="number"], .wy-control-group.wy-control-group-error input[type="search"], .wy-control-group.wy-control-group-error input[type="tel"], .wy-control-group.wy-control-group-error input[type="color"] {
+    border: solid 1px #E74C3C
+}
+
+.wy-control-group.wy-control-group-error textarea {
+    border: solid 1px #E74C3C
+}
+
+.wy-inline-validate {
+    white-space: nowrap
+}
+
+.wy-inline-validate .wy-input-context {
+    padding: 0.5em 0.625em;
+    display: inline-block;
+    font-size: 80%
+}
+
+.wy-inline-validate.wy-inline-validate-success .wy-input-context {
+    color: #27AE60
+}
+
+.wy-inline-validate.wy-inline-validate-danger .wy-input-context {
+    color: #E74C3C
+}
+
+.wy-inline-validate.wy-inline-validate-warning .wy-input-context {
+    color: #E67E22
+}
+
+.wy-inline-validate.wy-inline-validate-info .wy-input-context {
+    color: #2980B9
+}
+
+.rotate-90 {
+    -webkit-transform: rotate(90deg);
+    -moz-transform: rotate(90deg);
+    -ms-transform: rotate(90deg);
+    -o-transform: rotate(90deg);
+    transform: rotate(90deg)
+}
+
+.rotate-180 {
+    -webkit-transform: rotate(180deg);
+    -moz-transform: rotate(180deg);
+    -ms-transform: rotate(180deg);
+    -o-transform: rotate(180deg);
+    transform: rotate(180deg)
+}
+
+.rotate-270 {
+    -webkit-transform: rotate(270deg);
+    -moz-transform: rotate(270deg);
+    -ms-transform: rotate(270deg);
+    -o-transform: rotate(270deg);
+    transform: rotate(270deg)
+}
+
+.mirror {
+    -webkit-transform: scaleX(-1);
+    -moz-transform: scaleX(-1);
+    -ms-transform: scaleX(-1);
+    -o-transform: scaleX(-1);
+    transform: scaleX(-1)
+}
+
+.mirror.rotate-90 {
+    -webkit-transform: scaleX(-1) rotate(90deg);
+    -moz-transform: scaleX(-1) rotate(90deg);
+    -ms-transform: scaleX(-1) rotate(90deg);
+    -o-transform: scaleX(-1) rotate(90deg);
+    transform: scaleX(-1) rotate(90deg)
+}
+
+.mirror.rotate-180 {
+    -webkit-transform: scaleX(-1) rotate(180deg);
+    -moz-transform: scaleX(-1) rotate(180deg);
+    -ms-transform: scaleX(-1) rotate(180deg);
+    -o-transform: scaleX(-1) rotate(180deg);
+    transform: scaleX(-1) rotate(180deg)
+}
+
+.mirror.rotate-270 {
+    -webkit-transform: scaleX(-1) rotate(270deg);
+    -moz-transform: scaleX(-1) rotate(270deg);
+    -ms-transform: scaleX(-1) rotate(270deg);
+    -o-transform: scaleX(-1) rotate(270deg);
+    transform: scaleX(-1) rotate(270deg)
+}
+
+@media only screen and (max-width: 480px) {
+    .wy-form button[type="submit"] {
+        margin: 0.7em 0 0
+    }
+
+    .wy-form input[type="text"], .wy-form input[type="password"], .wy-form input[type="email"], .wy-form input[type="url"], .wy-form input[type="date"], .wy-form input[type="month"], .wy-form input[type="time"], .wy-form input[type="datetime"], .wy-form input[type="datetime-local"], .wy-form input[type="week"], .wy-form input[type="number"], .wy-form input[type="search"], .wy-form input[type="tel"], .wy-form input[type="color"] {
+        margin-bottom: 0.3em;
+        display: block
+    }
+
+    .wy-form label {
+        margin-bottom: 0.3em;
+        display: block
+    }
+
+    .wy-form input[type="password"], .wy-form input[type="email"], .wy-form input[type="url"], .wy-form input[type="date"], .wy-form input[type="month"], .wy-form input[type="time"], .wy-form input[type="datetime"], .wy-form input[type="datetime-local"], .wy-form input[type="week"], .wy-form input[type="number"], .wy-form input[type="search"], .wy-form input[type="tel"], .wy-form input[type="color"] {
+        margin-bottom: 0
+    }
+
+    .wy-form-aligned .wy-control-group label {
+        margin-bottom: 0.3em;
+        text-align: left;
+        display: block;
+        width: 100%
+    }
+
+    .wy-form-aligned .wy-control {
+        margin: 1.5em 0 0 0
+    }
+
+    .wy-form .wy-help-inline, .wy-form-message-inline, .wy-form-message {
+        display: block;
+        font-size: 80%;
+        padding: 6px 0
+    }
+}
+
+@media screen and (max-width: 768px) {
+    .tablet-hide {
+        display: none
+    }
+}
+
+@media screen and (max-width: 480px) {
+    .mobile-hide {
+        display: none
+    }
+}
+
+.float-left {
+    float: left
+}
+
+.float-right {
+    float: right
+}
+
+.full-width {
+    width: 100%
+}
+
+.wy-table, .rst-content table.docutils, .rst-content table.field-list {
+    border-collapse: collapse;
+    border-spacing: 0;
+    empty-cells: show;
+    margin-bottom: 24px
+}
+
+.wy-table caption, .rst-content table.docutils caption, .rst-content table.field-list caption {
+    color: #000;
+    font: italic 85%/1 arial, sans-serif;
+    padding: 1em 0;
+    text-align: center
+}
+
+.wy-table td, .rst-content table.docutils td, .rst-content table.field-list td, .wy-table th, .rst-content table.docutils th, .rst-content table.field-list th {
+    font-size: 90%;
+    margin: 0;
+    overflow: visible;
+    padding: 8px 16px
+}
+
+.wy-table td:first-child, .rst-content table.docutils td:first-child, .rst-content table.field-list td:first-child, .wy-table th:first-child, .rst-content table.docutils th:first-child, .rst-content table.field-list th:first-child {
+    border-left-width: 0
+}
+
+.wy-table thead, .rst-content table.docutils thead, .rst-content table.field-list thead {
+    color: #000;
+    text-align: left;
+    vertical-align: bottom;
+    white-space: nowrap
+}
+
+.wy-table thead th, .rst-content table.docutils thead th, .rst-content table.field-list thead th {
+    font-weight: bold;
+    border-bottom: solid 2px #e1e4e5
+}
+
+.wy-table td, .rst-content table.docutils td, .rst-content table.field-list td {
+    background-color: transparent;
+    vertical-align: middle
+}
+
+.wy-table td p, .rst-content table.docutils td p, .rst-content table.field-list td p {
+    line-height: 18px
+}
+
+.wy-table td p:last-child, .rst-content table.docutils td p:last-child, .rst-content table.field-list td p:last-child {
+    margin-bottom: 0
+}
+
+.wy-table .wy-table-cell-min, .rst-content table.docutils .wy-table-cell-min, .rst-content table.field-list .wy-table-cell-min {
+    width: 1%;
+    padding-right: 0
+}
+
+.wy-table .wy-table-cell-min input[type=checkbox], .rst-content table.docutils .wy-table-cell-min input[type=checkbox], .rst-content table.field-list .wy-table-cell-min input[type=checkbox], .wy-table .wy-table-cell-min input[type=checkbox], .rst-content table.docutils .wy-table-cell-min input[type=checkbox], .rst-content table.field-list .wy-table-cell-min input[type=checkbox] {
+    margin: 0
+}
+
+.wy-table-secondary {
+    color: gray;
+    font-size: 90%
+}
+
+.wy-table-tertiary {
+    color: gray;
+    font-size: 80%
+}
+
+.wy-table-odd td, .wy-table-striped tr:nth-child(2n-1) td, .rst-content table.docutils:not(.field-list) tr:nth-child(2n-1) td {
+    background-color: #f3f6f6
+}
+
+.wy-table-backed {
+    background-color: #f3f6f6
+}
+
+.wy-table-bordered-all, .rst-content table.docutils {
+    border: 1px solid #e1e4e5
+}
+
+.wy-table-bordered-all td, .rst-content table.docutils td {
+    border-bottom: 1px solid #e1e4e5;
+    border-left: 1px solid #e1e4e5
+}
+
+.wy-table-bordered-all tbody > tr:last-child td, .rst-content table.docutils tbody > tr:last-child td {
+    border-bottom-width: 0
+}
+
+.wy-table-bordered {
+    border: 1px solid #e1e4e5
+}
+
+.wy-table-bordered-rows td {
+    border-bottom: 1px solid #e1e4e5
+}
+
+.wy-table-bordered-rows tbody > tr:last-child td {
+    border-bottom-width: 0
+}
+
+.wy-table-horizontal tbody > tr:last-child td {
+    border-bottom-width: 0
+}
+
+.wy-table-horizontal td, .wy-table-horizontal th {
+    border-width: 0 0 1px 0;
+    border-bottom: 1px solid #e1e4e5
+}
+
+.wy-table-horiz

<TRUNCATED>

[03/60] [abbrv] incubator-usergrid git commit: cherry picking docs from master

[sn...@apache.org]

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/user-management/working-user-data.html
----------------------------------------------------------------------
diff --git a/content/docs/user-management/working-user-data.html b/content/docs/user-management/working-user-data.html
new file mode 100644
index 0000000..58e40bc
--- /dev/null
+++ b/content/docs/user-management/working-user-data.html
@@ -0,0 +1,700 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>Working with User Data &mdash; Apache Usergrid 1.0 documentation</title>
+  
+
+  
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+
+  
+    <link rel="top" title="Apache Usergrid 1.0 documentation" href="../index.html"/>
+        <link rel="next" title="Working with group data" href="group.html"/>
+        <link rel="prev" title="User management &amp; social graph" href="user-management.html"/> 
+
+  
+  <script src="../_static/js/modernizr.min.js"></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="../index.html" class="icon icon-home"> Apache Usergrid
+        
+
+        
+        </a>
+
+        
+          
+          
+            <div class="version">
+              1.0
+            </div>
+          
+        
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <p class="caption"><span class="caption-text">Introduction</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/usergrid-features.html">Usergrid Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/data-model.html">Usergrid Data model</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../introduction/async-vs-sync.html">Async vs. sync calls</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Getting Started</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-a-new-application.html">Creating a new application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/creating-account.html">Creating an Usergrid Account</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-a-sandbox-app.html">Using a Sandbox Application</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../getting-started/using-the-api.html">Using the API</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Storage</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/data-store-dbms.html">The Usergrid Data Store</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/optimizing-access.html">Data Store Best Practices</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/collections.html">Collections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-storage/entities.html">Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Data Queries</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/querying-your-data.html">Querying your data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/query-parameters.html">Query parameters &amp; clauses</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/operators-and-types.html">Query operators &amp; data types</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../data-queries/advanced-query-usage.html">Advanced query usage</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Entity Connections</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/connecting-entities.html">Connecting entities</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/retrieving-entities.html">Retrieving connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../entity-connections/disconnecting-entities.html">Disconnecting entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Security &amp; Authentication</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/app-security.html">Security &amp; token authentication</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/using-permissions.html">Using permissions</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating users &amp; app clients</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/user-authentication-types.html">Authentication levels</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/changing-token-time-live-ttl.html">Changing token expiration (time-to-live)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/authenticating-api-requests.html">Authenticating API requests</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/revoking-tokens-logout.html">Revoking tokens (logout)</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/facebook-sign.html">Facebook sign in</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../security-and-auth/securing-your-app.html">Security best practices</a></li>
+</ul>
+<p class="caption"><span class="caption-text">User Management &amp; Social Graph</span></p>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="user-management.html">User management &amp; social graph</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">Working with User Data</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#creating-users">Creating users</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#request-syntax">Request Syntax</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#request-uri">Request URI</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#example">Example</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#request">Request</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#response">Response</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#retrieving-user-data">Retrieving user data</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#id1">Request Syntax</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id2">Request URI</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#id3">Example</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#updating-deleting-user-data">Updating &amp; deleting user data</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#changing-a-user-password">Changing a user password</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#id4">Request syntax</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="#resetting-a-user-password">Resetting a user password</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#step-1-get-the-password-reset-request-form">STEP 1: Get the password reset request form.</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#step-2-display-the-returned-password-reset-request-form-to-the-user">STEP 2: Display the returned password reset request form to the user.</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#step-3-let-usergrid-handle-the-rest">STEP 3: Let Usergrid handle the rest!</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="group.html">Working with group data</a></li>
+<li class="toctree-l1"><a class="reference internal" href="activity.html">Activity</a></li>
+<li class="toctree-l1"><a class="reference internal" href="user-connections.html">Social Graph Connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="user-connections.html#creating-other-connections">Creating other connections</a></li>
+<li class="toctree-l1"><a class="reference internal" href="messagee-example.html">App Example - Messagee</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Geo-location</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../geolocation/geolocation.html">Geolocating your Entities</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Assets &amp; Files</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/uploading-assets.html">Uploading assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/retrieving-assets.html">Retrieving assets</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../asset-and-files/folders.html">Folders</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Counters &amp; Events</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/events-and-counters.html">Counters &amp; events</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html">Creating &amp; incrementing counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#decrementing-resetting-counters">Decrementing/resetting counters</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/creating-and-incrementing-counters.html#using-counters-hierarchically">Using counters hierarchically</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../counters-and-events/retrieving-counters.html">Retrieving counters</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Organizations &amp; Applications</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/managing.html">Organization &amp; application management</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/organization.html">Organization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../orgs-and-apps/application.html">Application</a></li>
+</ul>
+<p class="caption"><span class="caption-text">API Reference</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html">Methods</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../rest-endpoints/api-docs.html#models">Models</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Client SDKs</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../sdks/tbd.html">COMING SOON...</a></li>
+</ul>
+<p class="caption"><span class="caption-text">Installing the Stack</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-deploy-to-tomcat.html">Usegrid 1: Deploying to Tomcat</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug1-launcher-quick-start.html">Usegrid 1: Launcher Quick-start</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../installation/ug2-deploy-to-tomcat.html">Usergrid 2: Deploy to Tomcat</a></li>
+</ul>
+<p class="caption"><span class="caption-text">More about Usergrid</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../reference/presos-and-videos.html">Presentations &amp; Videos</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../reference/contribute-code.html">How to Contribute Code &amp; Docs</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Usergrid</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+    <li>Working with User Data</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          
+            <a href="../_sources/user-management/working-user-data.txt" rel="nofollow"> View page source</a>
+          
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
+            
+  <div class="section" id="working-with-user-data">
+<h1>Working with User Data<a class="headerlink" href="#working-with-user-data" title="Permalink to this headline">¶</a></h1>
+<p>You can store and manage user data as User entities. With user data in
+your application, you can add support for a wide variety of features
+common to mobile apps. For example, you can:</p>
+<ul class="simple">
+<li>Control access to data by defining permission rules. (See Security &amp;
+token authentication for more.)</li>
+<li>Present content specific to each user, such as their list of
+favorites.</li>
+<li>Support social features, such as letting users &#8220;follow&#8221; one another,
+for example.</li>
+</ul>
+<p>In mobile applications, data about users is typically added by users
+themselves when they register through your app. The topics in this
+section provide specific cURL and SDK-specific examples for getting
+things done with user data.</p>
+<div class="section" id="creating-users">
+<h2>Creating users<a class="headerlink" href="#creating-users" title="Permalink to this headline">¶</a></h2>
+<p>A user entity represents an application user. Using API Services you can
+create, retrieve, update, delete, and query user entities. See User
+entity properties for a list of the system-defined properties for user
+entities. In addition, you can create user properties specific to your
+application.</p>
+<div class="section" id="request-syntax">
+<h3>Request Syntax<a class="headerlink" href="#request-syntax" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X POST &quot;https://api.usergrid.com/your-org/your-app/users&quot; -d &#39;{ &quot;username&quot;: &quot;john.doe&quot;, &quot;email&quot;: &quot;john.doe@gmail.com&quot;, &quot;name&quot;: &quot;John Doe&quot;, &quot;password&quot;: &quot;test1234&quot; }&#39;
+</pre></div>
+</div>
+<p>Use the POST method to create a new user in the users collection.</p>
+</div>
+<div class="section" id="request-uri">
+<h3>Request URI<a class="headerlink" href="#request-uri" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>POST /&lt;org_id&gt;/&lt;app_id&gt;/users
+</pre></div>
+</div>
+<p>Parameters</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="31%" />
+<col width="69%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>uuid | org_id</td>
+<td>Organization UUID or organization name.</td>
+</tr>
+<tr class="row-odd"><td>uuid | app_id</td>
+<td>Application UUID or application name.</td>
+</tr>
+<tr class="row-even"><td>request body</td>
+<td>One or more sets of user properties.</td>
+</tr>
+</tbody>
+</table>
+<p>The username is mandatory and must be unique. Here&#8217;s an example:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+    <span class="s">&quot;username&quot;</span> <span class="p">:</span> <span class="s">&quot;john.doe&quot;</span><span class="p">,</span>
+    <span class="s">&quot;email&quot;</span> <span class="p">:</span> <span class="s">&quot;john.doe@gmail.com&quot;</span><span class="p">,</span>
+    <span class="s">&quot;name&quot;</span> <span class="p">:</span> <span class="s">&quot;John Doe&quot;</span><span class="p">,</span>
+    <span class="s">&quot;password&quot;</span> <span class="p">:</span> <span class="s">&quot;test1234&quot;</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+<p>Although the password parameter is not mandatory, if you don&#8217;t specify
+it, the user will not be able to log in using username and password
+credentials. If a password is not specified for the user, and you&#8217;re an
+Admin, you can set a password for the user (see Setting a password).</p>
+<p>__ Note__: The username can contain any combination of characters,
+including those that represent letters, numbers, and symbols.</p>
+</div>
+<div class="section" id="example">
+<h3>Example<a class="headerlink" href="#example" title="Permalink to this headline">¶</a></h3>
+<p><strong>Note</strong>: Although not shown in the API examples below, you need to
+provide a valid access token with each API call. See Authenticating
+users and application clients for details.</p>
+</div>
+<div class="section" id="request">
+<h3>Request<a class="headerlink" href="#request" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X POST &quot;https://api.usergrid.com/my-org/my-app/users&quot; -d &#39;{&quot;username&quot;:&quot;john.doe&quot;,&quot;email&quot;:&quot;john.doe@gmail.com&quot;,&quot;name&quot;:&quot;John Doe&quot;}&#39;
+</pre></div>
+</div>
+</div>
+<div class="section" id="response">
+<h3>Response<a class="headerlink" href="#response" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+  <span class="s">&quot;action&quot;</span> <span class="p">:</span> <span class="s">&quot;post&quot;</span><span class="p">,</span>
+  <span class="s">&quot;application&quot;</span> <span class="p">:</span> <span class="s">&quot;db1e60a0-417f-11e3-9586-0f1ff3650d20&quot;</span><span class="p">,</span>
+  <span class="s">&quot;params&quot;</span> <span class="p">:</span> <span class="p">{</span> <span class="p">},</span>
+  <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span class="s">&quot;/users&quot;</span><span class="p">,</span>
+  <span class="s">&quot;uri&quot;</span> <span class="p">:</span> <span class="s">&quot;https://api.usergrid.com/steventraut/mynewapp/users&quot;</span><span class="p">,</span>
+  <span class="s">&quot;entities&quot;</span> <span class="p">:</span> <span class="p">[</span> <span class="p">{</span>
+    <span class="s">&quot;uuid&quot;</span> <span class="p">:</span> <span class="s">&quot;8ae8a6ea-84a5-11e3-884d-f18e8f6fb3bc&quot;</span><span class="p">,</span>
+    <span class="s">&quot;type&quot;</span> <span class="p">:</span> <span class="s">&quot;user&quot;</span><span class="p">,</span>
+    <span class="s">&quot;name&quot;</span> <span class="p">:</span> <span class="s">&quot;John Doe&quot;</span><span class="p">,</span>
+    <span class="s">&quot;created&quot;</span> <span class="p">:</span> <span class="mi">1390533228622</span><span class="p">,</span>
+    <span class="s">&quot;modified&quot;</span> <span class="p">:</span> <span class="mi">1390533228622</span><span class="p">,</span>
+    <span class="s">&quot;username&quot;</span> <span class="p">:</span> <span class="s">&quot;john.doe&quot;</span><span class="p">,</span>
+    <span class="s">&quot;email&quot;</span> <span class="p">:</span> <span class="s">&quot;john.doe@gmail.com&quot;</span><span class="p">,</span>
+    <span class="s">&quot;activated&quot;</span> <span class="p">:</span> <span class="n">true</span><span class="p">,</span>
+    <span class="s">&quot;picture&quot;</span> <span class="p">:</span> <span class="s">&quot;http://www.gravatar.com/avatar/e13743a7f1db7f4246badd6fd6ff54ff&quot;</span><span class="p">,</span>
+    <span class="s">&quot;metadata&quot;</span> <span class="p">:</span> <span class="p">{</span>
+      <span class="s">&quot;path&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/8ae8a6ea-84a5-11e3-884d-f18e8f6fb3bc&quot;</span><span class="p">,</span>
+      <span class="s">&quot;sets&quot;</span> <span class="p">:</span> <span class="p">{</span>
+        <span class="s">&quot;rolenames&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/8ae8a6ea-84a5-11e3-884d-f18e8f6fb3bc/roles&quot;</span><span class="p">,</span>
+        <span class="s">&quot;permissions&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/8ae8a6ea-84a5-11e3-884d-f18e8f6fb3bc/permissions&quot;</span>
+      <span class="p">},</span>
+      <span class="s">&quot;collections&quot;</span> <span class="p">:</span> <span class="p">{</span>
+        <span class="s">&quot;activities&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/8ae8a6ea-84a5-11e3-884d-f18e8f6fb3bc/activities&quot;</span><span class="p">,</span>
+        <span class="s">&quot;devices&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/8ae8a6ea-84a5-11e3-884d-f18e8f6fb3bc/devices&quot;</span><span class="p">,</span>
+        <span class="s">&quot;feed&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/8ae8a6ea-84a5-11e3-884d-f18e8f6fb3bc/feed&quot;</span><span class="p">,</span>
+        <span class="s">&quot;groups&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/8ae8a6ea-84a5-11e3-884d-f18e8f6fb3bc/groups&quot;</span><span class="p">,</span>
+        <span class="s">&quot;roles&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/8ae8a6ea-84a5-11e3-884d-f18e8f6fb3bc/roles&quot;</span><span class="p">,</span>
+        <span class="s">&quot;following&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/8ae8a6ea-84a5-11e3-884d-f18e8f6fb3bc/following&quot;</span><span class="p">,</span>
+        <span class="s">&quot;followers&quot;</span> <span class="p">:</span> <span class="s">&quot;/users/8ae8a6ea-84a5-11e3-884d-f18e8f6fb3bc/followers&quot;</span>
+      <span class="p">}</span>
+    <span class="p">}</span>
+  <span class="p">}],</span>
+  <span class="s">&quot;timestamp&quot;</span> <span class="p">:</span> <span class="mi">1390533228619</span><span class="p">,</span>
+  <span class="s">&quot;duration&quot;</span> <span class="p">:</span> <span class="mi">142</span><span class="p">,</span>
+  <span class="s">&quot;organization&quot;</span> <span class="p">:</span> <span class="s">&quot;my-org&quot;</span><span class="p">,</span>
+  <span class="s">&quot;applicationName&quot;</span> <span class="p">:</span> <span class="s">&quot;my-app&quot;</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+</div>
+<div class="section" id="retrieving-user-data">
+<h2>Retrieving user data<a class="headerlink" href="#retrieving-user-data" title="Permalink to this headline">¶</a></h2>
+<p>You can retrieve data about users through cURL or one of the SDKs. Each
+provides a way to filter the list of users by data associated with the
+user, such as username or UUID, or other properties in the user entity.</p>
+<p>See User entity properties for a list of the system-defined properties
+for user entities. In addition, you can create user properties specific
+to your application.</p>
+<div class="section" id="id1">
+<h3>Request Syntax<a class="headerlink" href="#id1" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X GET &quot;https://api.usergrid.com/your-org/your-app/users&quot;
+</pre></div>
+</div>
+<p>Use the GET method to retrieve user data.</p>
+</div>
+<div class="section" id="id2">
+<h3>Request URI<a class="headerlink" href="#id2" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>GET /&lt;org_id&gt;/&lt;app_id&gt;/users/&lt;uuid | username | email_address | ?ql=query_string&gt;
+</pre></div>
+</div>
+<p>Parameters</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="31%" />
+<col width="69%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>uuid | org_id</td>
+<td>Organization UUID or organization name</td>
+</tr>
+<tr class="row-odd"><td>uuid | app_id</td>
+<td>Application UUID or application name</td>
+</tr>
+<tr class="row-even"><td>user identifier</td>
+<td>User UUID, username, or email address.</td>
+</tr>
+</tbody>
+</table>
+<p>The alias <code class="docutils literal"><span class="pre">/users/me</span></code> can be used in place of the current user’s uuid,
+username, or email address. Note: The <code class="docutils literal"><span class="pre">/users/me</span></code> endpoint is
+accessible only if you provide an access token with the request (see
+Authenticating users and application clients). If you make an anonymous
+(&#8220;guest&#8221;) call, the system will not be able to determine which user to
+return as /users/me.</p>
+<p><strong>Note</strong>: The username can contain any combination of characters,
+including those that represent letters, numbers, and symbols.</p>
+</div>
+<div class="section" id="id3">
+<h3>Example<a class="headerlink" href="#id3" title="Permalink to this headline">¶</a></h3>
+<p><strong>Note</strong>: Although not shown in the API examples below, you need to
+provide a valid access token with each API call. See <a class="reference external" href="../security-and-auth/authenticating-users-and-application-clients.html">Authenticating
+users and application
+clients</a>
+for details.</p>
+<p>Requests</p>
+<div class="highlight-python"><div class="highlight"><pre># Get a user by username.
+curl -X GET &quot;https://api.usergrid.com/my-org/my-app/users/jane.doe&quot;
+
+# Get a user by UUID.
+curl -X GET &quot;https://api.usergrid.com/my-org/my-app/users/a407b1e7-58e8-11e1-ac46-22000a1c5a67e&quot;
+
+# Get a user by email.
+curl -X GET &quot;https://api.usergrid.com/my-org/my-app/users/jane.doe@gmail.com&quot;
+
+# Get user data filtering by their city property value.
+curl -X GET &quot;https://api.usergrid.com/my-org/my-app/users?ql=select%20*%20where%20adr.city%3D&#39;Chicago&#39;&quot;
+</pre></div>
+</div>
+<p>Response</p>
+<div class="highlight-python"><div class="highlight"><pre>{
+    &quot;action&quot; : &quot;get&quot;,
+    &quot;application&quot; : &quot;1c8f60e4-da67-11e0-b93d-12313f0204bb8&quot;,
+    &quot;params&quot; : {
+        &quot;_&quot;: [
+            &quot;1315524419746&quot;
+        ]
+    },
+    &quot;path&quot; : &quot;https://api.usergrid.com/12313f0204bb-1c8f60e4-da67-11e0-b93d/1c8f60e4-da67-11e0-b93d-12313f0204bb/users&quot;,
+    &quot;uri&quot; : &quot;https://api.usergrid.com/005056c00008-4353136f-e978-11e0-8264/4353136f-e978-11e0-8264-005056c00008/users&quot;,
+    &quot;entities&quot; : [ {
+        &quot;uuid&quot; : &quot;78c54a82-da71-11e0-b93d-12313f0204b&quot;,
+        &quot;type&quot; : &quot;user&quot;,
+        &quot;created&quot; : 1315524171347008,
+        &quot;modified&quot; : 1315524171347008,
+        &quot;activated&quot; : true,
+        &quot;email&quot; : &quot;jane.doe@gmail.com&quot;,
+        &quot;metadata&quot; : {
+            &quot;path&quot; : &quot;/users/78c54a82-da71-11e0-b93d-12313f0204bb&quot;,
+            &quot;sets&quot; : {
+                &quot;rolenames&quot; : &quot;/users/78c54a82-da71-11e0-b93d-12313f0204bb/rolenames&quot;,
+                &quot;permissions&quot; : &quot;/users/78c54a82-da71-11e0-b93d-12313f0204bb/permissions&quot;
+            },
+            &quot;collections&quot; : {
+                &quot;activities&quot; : &quot;/users/78c54a82-da71-11e0-b93d-12313f0204bb/activities&quot;,
+                &quot;devices&quot; : &quot;/users/78c54a82-da71-11e0-b93d-12313f0204bb/devices&quot;,
+                &quot;feed&quot; : &quot;/users/78c54a82-da71-11e0-b93d-12313f0204bb/feed&quot;,
+                &quot;groups&quot; : &quot;/users/78c54a82-da71-11e0-b93d-12313f0204bb/groups&quot;,
+                &quot;roles&quot; : &quot;/users/78c54a82-da71-11e0-b93d-12313f0204bb/roles&quot;,
+                &quot;following&quot; : &quot;/users/78c54a82-da71-11e0-b93d-12313f0204bb/following&quot;,
+                &quot;followers&quot; : &quot;/users/78c54a82-da71-11e0-b93d-12313f0204bb/followers&quot;
+            }
+        },
+        &quot;username&quot; : &quot;jane.doe&quot;
+    }
+    ... Additional entities here if data for multiple users was returned...
+    ],
+    &quot;timestamp&quot; : 1315524421071,
+    &quot;duration&quot; : 107,
+    &quot;organization&quot; : &quot;my-org&quot;,
+    &quot;applicationName&quot;: &quot;my-app&quot;
+}
+</pre></div>
+</div>
+</div>
+</div>
+<div class="section" id="updating-deleting-user-data">
+<h2>Updating &amp; deleting user data<a class="headerlink" href="#updating-deleting-user-data" title="Permalink to this headline">¶</a></h2>
+<p>To update or delete a user, perform an update or delete on the
+associated user entity as you would any other entity. For more
+information and code samples, see <a class="reference external" href="../data-storage/entities.html#updating-data-entities">Updating Data
+Entities</a> and
+<a class="reference external" href="../data-storage/entities.html#deleting-data-entities">Deleting Data
+Entities</a>.</p>
+</div>
+<div class="section" id="changing-a-user-password">
+<h2>Changing a user password<a class="headerlink" href="#changing-a-user-password" title="Permalink to this headline">¶</a></h2>
+<p>Changing a user&#8217;s password</p>
+<div class="section" id="id4">
+<h3>Request syntax<a class="headerlink" href="#id4" title="Permalink to this headline">¶</a></h3>
+<div class="highlight-python"><div class="highlight"><pre>curl -X PUT https://api.usergrid.com/&lt;org&gt;/&lt;app&gt;/users/&lt;username_or_email&gt;/password -d &#39;{oldpassword:&lt;old_password&gt;,newpassword:&lt;new_password&gt;}&#39;
+</pre></div>
+</div>
+<p>Parameters</p>
+<table border="1" class="docutils">
+<colgroup>
+<col width="24%" />
+<col width="76%" />
+</colgroup>
+<thead valign="bottom">
+<tr class="row-odd"><th class="head">Parameter</th>
+<th class="head">Description</th>
+</tr>
+</thead>
+<tbody valign="top">
+<tr class="row-even"><td>org</td>
+<td>Organization UUID or organization name</td>
+</tr>
+<tr class="row-odd"><td>app</td>
+<td>Application UUID or application name</td>
+</tr>
+<tr class="row-even"><td>username_or_email</td>
+<td>Username or email of the user entity whose password you want to reset.</td>
+</tr>
+<tr class="row-odd"><td>old_password</td>
+<td>User entity&#8217;s old password.</td>
+</tr>
+<tr class="row-even"><td>new_password</td>
+<td>User entity&#8217;s new password.</td>
+</tr>
+</tbody>
+</table>
+<p><strong>Note</strong>: If your request is authenticated with an application-level
+token, then <code class="docutils literal"><span class="pre">old_password</span></code> is not required. For more, see <a class="reference external" href="../security-and-auth/authenticating-users-and-application-clients.html#application-client-authentication">Application
+client
+authentication</a>.</p>
+<p>Example request</p>
+<div class="highlight-python"><div class="highlight"><pre>curl -X PUT https://api.usergrid.com/my-org/my-app/users/john.doe/password -d &#39;{&quot;newpassword&quot;:&quot;foo9876a&quot;,&quot;oldpassword&quot;:&quot;bar1234b&quot;}&#39;
+</pre></div>
+</div>
+<p>Example response</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+  <span class="s">&quot;action&quot;</span><span class="p">:</span> <span class="s">&quot;set user password&quot;</span><span class="p">,</span>
+  <span class="s">&quot;timestamp&quot;</span><span class="p">:</span> <span class="mi">1355185897894</span><span class="p">,</span>
+  <span class="s">&quot;duration&quot;</span><span class="p">:</span> <span class="mi">47</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+</div>
+<div class="section" id="resetting-a-user-password">
+<h2>Resetting a user password<a class="headerlink" href="#resetting-a-user-password" title="Permalink to this headline">¶</a></h2>
+<p>Resetting a user&#8217;s password</p>
+<p>Usergrid provides a standard password reset flow that can be implemented
+to allow a user to reset their password without having to provide their
+old password. The most common use of this would be a &#8216;Forgot password?&#8217;
+feature in your app.</p>
+<p>Note that you can also implement your own password reset flow using
+application-level authentication and the /password endpoint. For more,
+see <a class="reference external" href="#changing-a-user-password">Changing a user password</a>.</p>
+<p>To use the Usergrid password reset flow, do the following:</p>
+<div class="section" id="step-1-get-the-password-reset-request-form">
+<h3>STEP 1: Get the password reset request form.<a class="headerlink" href="#step-1-get-the-password-reset-request-form" title="Permalink to this headline">¶</a></h3>
+<p>Make a GET request to the following:</p>
+<div class="highlight-python"><div class="highlight"><pre>/users/&lt;username&gt;/resetpw
+</pre></div>
+</div>
+<p>For example, using cURL, a request to reset the password for a user with
+username &#8216;someUser&#8217; would look like this:</p>
+<div class="highlight-python"><div class="highlight"><pre>curl -x GET https://api.usergrid.com/your-org/your-app/users/someUser/resetpw
+</pre></div>
+</div>
+</div>
+<div class="section" id="step-2-display-the-returned-password-reset-request-form-to-the-user">
+<h3>STEP 2: Display the returned password reset request form to the user.<a class="headerlink" href="#step-2-display-the-returned-password-reset-request-form-to-the-user" title="Permalink to this headline">¶</a></h3>
+<p>The request to <code class="docutils literal"><span class="pre">/resetpw</span></code> will return the HTML for the standard
+Usergrid password reset request form that you will display to your user.
+The request form requires the users to provide their username as well as
+answer a standard CAPTCHA challenge:</p>
+<div class="highlight-python"><div class="highlight"><pre>&lt;!DOCTYPE html PUBLIC &quot;-//W3C//DTD HTML 4.01 Transitional//EN&quot; &quot;http://www.w3.org/TR/html4/loose.dtd&quot;&gt;
+&lt;html&gt;
+&lt;head&gt;
+&lt;meta http-equiv=&quot;Content-Type&quot; content=&quot;text/html; charset=ISO-8859-1&quot;&gt;
+&lt;title&gt;Reset Password&lt;/title&gt;
+&lt;link rel=&quot;stylesheet&quot; type=&quot;text/css&quot; href=&quot;/css/styles.css&quot; /&gt;
+&lt;/head&gt;
+&lt;body&gt;
+    &lt;div class=&quot;dialog-area&quot;&gt;
+
+        &lt;form class=&quot;dialog-form&quot; action=&quot;&quot; method=&quot;post&quot;&gt;
+            &lt;fieldset&gt;
+                &lt;p&gt;
+                    Enter the captcha to have your password reset instructions sent to
+                    someUser@adomain.com
+                &lt;/p&gt;
+                &lt;p id=&quot;human-proof&quot;&gt;&lt;/p&gt;
+                &lt;script type=&quot;text/javascript&quot; src=&quot;https://www.google.com/recaptcha/api/challenge?k=6LdSTNESAAAAAKHdVglHmMu86_EoYxsJjqQD1IpZ&quot;&gt;&lt;/script&gt;
+
+                &lt;p class=&quot;buttons&quot;&gt;
+                    &lt;input type=&quot;submit&quot; value=&quot;submit&quot; /&gt;
+                &lt;/p&gt;
+            &lt;/fieldset&gt;
+        &lt;/form&gt;
+    &lt;/div&gt;
+&lt;/body&gt;
+&lt;/html&gt;
+</pre></div>
+</div>
+<p>You can apply any additional styling you wish to the form to make it
+match the style of your app before displaying it to the user.</p>
+</div>
+<div class="section" id="step-3-let-usergrid-handle-the-rest">
+<h3>STEP 3: Let Usergrid handle the rest!<a class="headerlink" href="#step-3-let-usergrid-handle-the-rest" title="Permalink to this headline">¶</a></h3>
+<p>Once the user submits the form with their username, they will receive an
+email from Usergrid that contains a link to the password reset form,
+where they can specify a new password. The user entity will be updated
+immediately.</p>
+</div>
+</div>
+</div>
+
+
+           </div>
+          </div>
+          <footer>
+  
+    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+      
+        <a href="group.html" class="btn btn-neutral float-right" title="Working with group data" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+      
+      
+        <a href="user-management.html" class="btn btn-neutral" title="User management &amp; social graph" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+      
+    </div>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2013-2015, Apache Usergrid.
+
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'1.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/index.html
----------------------------------------------------------------------
diff --git a/content/index.html b/content/index.html
new file mode 100644
index 0000000..23096ce
--- /dev/null
+++ b/content/index.html
@@ -0,0 +1,264 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="utf-8">
+    <title>Apache Usergrid (incubating) — the BaaS not made for Hipsters</title>
+    <meta http-equiv="x-ua-compatible" content="ie=edge" />
+    <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1" />
+    <meta name="keywords" content="Apache Usergrid, Usergrid, BaaS, Backend-as-a-Service">
+    <meta name="description" content="An open-source Backend-as-a-Service stack for web & mobile applications, based on RESTful APIs." />
+    <meta property="og:title" content="Apache Usergrid" />
+    <meta property="og:description" content="An open-source Backend-as-a-Service stack for web & mobile applications, based on RESTful APIs." />
+    <!-- Loading Typekit -->
+    <script type="text/javascript" src="//use.typekit.net/ddl7izx.js"></script>
+    <script type="text/javascript">try{Typekit.load();}catch(e){}</script>
+    <!-- Loading Bootstrap -->
+    <link href="/bootstrap/bootstrap.min.css" rel="stylesheet" type='text/css'>
+    <link href="/css/bootflat.css" rel="stylesheet" type='text/css'>
+    <link href="/css/usergrid-site.css" rel="stylesheet" type='text/css'>
+    <link href="https://fonts.googleapis.com/css?family=Open+Sans:200,400,500,300,600,800,700,400italic,600italic,700italic,800italic,300italic" rel="stylesheet" type="text/css">
+    <link href="/css/font-awesome.min.css" rel="stylesheet" type='text/css'>
+
+    
+
+    <!-- HTML5 shim, for IE6-8 support of HTML5 elements. All other JS at the end of file. -->
+    <!--[if lt IE 9]>
+      <script src="js/html5shiv.js"></script>
+      <script src="js/respond.min.js"></script>
+    <![endif]-->
+</head>
+<body>
+
+    <header class="navbar navbar-inverse navbar-fixed-top bf-docs-nav " role="banner">
+    <div class="container">
+        <div class="navbar-header">
+            <button class="navbar-toggle" type="button" data-toggle="collapse" data-target=".bf-navbar-collapse">
+                <span class="sr-only">Toggle navigation</span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+            </button>
+        </div>
+        <a href="/" class="navbar-brand">
+                <img id="home-logo" src="/img/apache_usergrid_logo_white_small.png" />
+            </a>
+        <nav class="collapse navbar-collapse bf-navbar-collapse" role="navigation">
+            <ul class="nav navbar-nav navbar-right">
+                <li class=""><a href="/community/"><span class="icns icon-group"></span></a></li>
+                <li><a href="docs" target="_blank"><span class="icns icon-book"></span></a></li>
+                <li><a href="http://github.com/apache/incubator-usergrid" target="_blank"><span class="icns icon-github-sign"></span></a></li>
+                <!--<li><a href="https://trello.com/b/exQmJIOn/usergrid" target="_blank"><span class="icns icon-trello"></span></a></li>-->
+                <li><a href="https://issues.apache.org/jira/secure/RapidBoard.jspa?rapidView=23&view=planning&selectedIssue=USERGRID-362&epics=visible" 
+                       target="_blank"><span class="icns icon-bug"></span></a></li>
+                <li><a href="http://stackoverflow.com/search?q=usergrid" target="_blank"><span class="icns icon-stackexchange"></span></a></li>
+                <li><a href="/community/#live"><span class="icns icon-comments"></span></a></li>
+                <!--<li><a href="https://groups.google.com/forum/#!forum/usergrid" target="_blank"><span class="icns icon-envelope"></span></a></li>-->
+                <li><a href="https://twitter.com/usergrid" target="_blank"><span class="icns icon-twitter"></span></a></li>
+                <li><a href="https://cwiki.apache.org/confluence/display/usergrid/" target="_blank"><span class="icns icon-wiki"></span></a></li>
+                <li><a href="/releases/"><span class="icns icon-releases"></span></a></li>
+            </ul>
+        </nav>
+    </div>
+    </header>
+
+
+
+
+
+<section class="bf-masthead" id="content" role="main">
+    <div class="bf-masthead-bg">
+        <div class="container">
+            <img class="logo-title img-responsive hidden-xs" src="img/apache_usergrid_logo_white.png" />
+            <div class="text-container">
+                <h2 class="tagline">The BaaS Framework <em>you</em> run</h2>
+                <p class="description">Build Apps not Servers! Whether you need to support one App or a hundred, Usergrid is <em>your</em> backend. As easy as a LAMP stack, but built for mobile.
+                  Get Apps to production in record time and stop wasting cycles writing server-side code.<br/><br/>
+                  Complete SDKs for iOS, Android, HTML5/JS, Node.js, Ruby, Java, .NET, and PHP. Open source since 2011.<br/><br/><em>Currently undergoing incubation at the Apache Software Foundation</em></p>
+            </div>
+
+            <div class="btn-wrapper">
+                <iframe class="social-btn" src="/static/github-btn.html?user=apache&repo=incubator-usergrid&type=watch&size=large" allowtransparency="true" frameborder="0" scrolling="0" width="85" height="30"></iframe>
+                <iframe class="social-btn" src="/static/github-btn.html?user=apache&repo=incubator-usergrid&type=fork&size=large" allowtransparency="true" frameborder="0" scrolling="0" width="85" height="30"></iframe>
+                <!--<p><span class="or">or</span> <a href="#">Download Usergrid</a></p>-->
+            </div>
+
+        </div>
+    </div>
+</section>
+
+<section class="bf-features">
+    <div class="container">
+        <div class="row">
+            <div class="col-md-4">
+                <div class="bf-icon-wrap"><i style="font-size:65px; vertical-align: -5px;" aria-hidden="true" class="icon-user"></i></div>
+                <h3>Users</h3>
+                <p>Sign up users, log in, reset passwords and more, in just one API call. You can put users in groups, assign roles or permissions, let users follow each other and access everything via OAuth 2.0, without writing a single line of server code.</p>
+            </div>
+            <div class="col-md-4">
+                <div class="bf-icon-wrap"><i style="font-size:65px; vertical-align: -5px;" aria-hidden="true" class="icon-hdd"></i></div>
+                <h3>Data</h3>
+                <p>If you can express it in JSON, we can store it! Underneath everything is stored in a standard Cassandra instance, but we’ve added the ability to retrieve data via an SQL-like syntax, manage collections and connections between entities.</p>
+            </div>
+            <div class="col-md-4">
+                <div class="bf-icon-wrap"><i aria-hidden="true" class="icon-picture"></i></div>
+                <h3>Files</h3>
+                <p>Our asset storage can handle anything from text files to videos of several terrabytes, with automatic content-detection and full URL access control. In the back, everything goes Amazon S3 or other preferred cloud file store.</p>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-md-4">
+                <div class="bf-icon-wrap" style="font-size:40px; vertical-align: 15px;"><i aria-hidden="true" class="icon-apple"></i> <i aria-hidden="true" class="icon-android"></i></div>
+                <h3>SDKs</h3>
+                <p>We have full SDKs for <a href="https://github.com/apache/incubator-usergrid/tree/master/sdks/ios">iOS</a>, <a href="https://github.com/apache/incubator-usergrid/tree/master/sdks/android">Android</a>, and <a href="https://github.com/apache/incubator-usergrid/tree/master/sdks/html5-javascript">HTML5/JS</a> but also <a href="https://github.com/apache/incubator-usergrid/tree/master/sdks/nodejs">node.js</a>, <a href="https://github.com/apache/incubator-usergrid/tree/master/sdks/ruby-on-rails">Ruby on Rails</a>, pure <a href="https://github.com/apache/incubator-usergrid/tree/master/sdks/ruby">pure Ruby</a>, server-side <a href="https://github.com/apache/incubator-usergrid/tree/master/sdks/java">Java</a>, <a href="https://github.com/apache/incubator-usergrid/tree/master/sdks/dotnet">.NET / Windows</a> and <a href="https://github.com/apache/incubator-usergrid/tree/master/sdks/php">PHP</a>!</p>
+            </div>
+            <div class="col-md-4">
+                <div class="bf-icon-wrap"><span style="font-size:60px" aria-hidden="true" class="icon-road"></span></div>
+                <h3>Java-based</h3>
+                <p>We build on standard Java components, such as Jersey, Jackson, Apache Cassandra and Lucene. That means you get operational predictability, all the benefits of the JVM, and easy extensibility.</p>
+            </div>
+            <div class="col-md-4">
+                <div class="bf-icon-wrap"><i style="font-size:65px; vertical-align: -5px;" aria-hidden="true" class="icon-lock"></i></div>
+                <h3>Trusted</h3>
+                <p>Usergrid is deployed by <a href="https://baas.io/">Korea Telecom</a>, <a href="http://globo.com">Globo</a>, <a href="http://apigee.com">Apigee</a> and many Fortune 500 companies. Our biggest deployments have hundreds of nodes and handle millions of users.</p>
+            </div>
+        </div>
+    </div>
+
+    </div>
+</section>
+
+<section class="bf-questions">
+    <div class="container">
+            <div class="col-md-12 text-center cta">
+                Interested? You can <a href="https://github.com/apache/incubator-usergrid/blob/master/stack#requirements" target="_blank" class="btn btn-inverse btn-lg">Try it on your Machine Now</a> <span class="avoidwrap">or&nbsp;<a href="/community/" class="btn btn-inverse btn-lg">Ask a Question on the Lists or at an Event Near You</a></span>
+            </div>
+    </div>
+</section
+
+<section class="bf-news">
+    <div class="container">
+
+        <div class="row">
+            <div class="col-md-12 text-left">
+                <h2>About the Project</h2>
+                <p>Apache Usergrid is currently undergoing Incubation at the Apache Software Foundation. It’s an open-source Backend-as-a-Service (“BaaS” or “mBaaS”) composed of an integrated distributed NoSQL database, application layer and client tier with SDKs for developers looking to rapidly build web and/or mobile applications. It provides elementary services (user registration & management, data storage, file storage, queues) and retrieval features (full text search, geolocation search, joins) to power common app features.</p>
+
+                <p>It is a multi-tenant system designed for deployment to public cloud environments (such as Amazon Web Services, Rackspace, etc.) or to run on traditional server infrastructures so that anyone can run their own private BaaS deployment.</p>
+
+                <p>For architects and back-end teams, it aims to provide a distributed, easily extendable, operationally predictable and highly scalable solution. For front-end developers, it aims to simplify the development process by enabling them to rapidly build and operate mobile and web applications without requiring backend expertise.</p>
+            </div>
+            <!--
+            <div class="col-md-4 text-left">
+                <h2>Recent Releases</h2>
+
+
+            </div>
+            -->
+        </div>
+
+    </div>
+</section>
+
+
+
+
+<footer class="bf-footer" role="contentinfo">
+    <div class="container">
+        <div class="row">
+            <div class="col-md-2">
+                <ul class="nav nav-list">
+                    <li class="nav-header"><a href="/">Home</a></li>
+                    <li class="nav-header"><a href="/community/">Community</a></li>
+                        <li><a href="/community/#events">Events</a></li>
+                        <li><a href="/community/#mailing-lists">Mailing Lists</a></li>
+                        <li><a href="/community/#deployments">Deployments</a></li>
+                        <li><a href="/community/#committers">Commiters</a></li>
+                </ul>
+            </div>
+            <div class="col-md-2">
+                <ul class="nav nav-list">
+                    <li class="nav-header"><a href="https://github.com/apache/incubator-usergrid/" target="_blank">Code</a></li>
+                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/stack" target="_blank">Server Stack</a></li>
+                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/portal" target="_blank">Admin Portal</a></li>
+                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/ugc" target="_blank">ugc command line</a></li>
+                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/ios" target="_blank">iOS SDK</a></li>
+                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/android" target="_blank">Android SDK</a></li>
+                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/html5-javascript" target="_blank">HTML5/JS SDK</a></li>
+                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/nodejs" target="_blank">node.js module</a></li>
+                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/ruby-on-rails" target="_blank">Ruby on Rails gem</a></li>
+                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/ruby" target="_blank">Ruby gem</a></li>
+                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/php" target="_blank">PHP SDK</a></li>
+                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/java" target="_blank">Java SDK</a></li>
+                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/dotnet" target="_blank">.NET / Windows SDK</a></li>
+                </ul>
+            </div>
+            <div class="col-md-2">
+                <ul class="nav nav-list">
+                    <li class="nav-header">Resources</li>
+                    <li><a href="http://github.com/apache/incubator-usergrid" target="_blank">GitHub Code</a></li>
+                    <li><a href="docs" target="_blank">Docs</a></li>
+                    <li><a href="https://issues.apache.org/jira/secure/RapidBoard.jspa?rapidView=23&view=planning&selectedIssue=USERGRID-362&epics=visible" target="_blank">JIRA Bug Tracker</a></li>
+                    <li><a href="http://stackoverflow.com/search?q=usergrid" target="_blank">StackOverflow</a></li>
+                    <li><a href="/community/#live">Live Chat</a></li>
+                    <li><a href="https://twitter.com/usergrid" target="_blank">Twitter</a></li>
+                    <li><a href="http://incubator.apache.org/projects/usergrid.html" target="_blank">Podling Listing</a></li>
+                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/stack#requirements" target="_blank">Getting Started</a></li>
+                    <li><a href="https://cwiki.apache.org/confluence/display/usergrid/GitHub+Based+Contribution+Workflow" target="_blank">Contribution Guidelines</a></li>
+                </ul>
+            </div>
+            <div class="col-md-2">
+                <ul class="nav nav-list">
+                    <li class="nav-header">Apache</li>
+                    <li><a href="http://www.apache.org/licenses/" target="_blank">License</a></li>
+                    <li><a href="http://www.apache.org/foundation/sponsorship.html" target="_blank">Sponsorship</a></li>
+                    <li><a href="http://www.apache.org/foundation/thanks.html" target="_blank">Thanks</a></li>
+                    <li><a href="http://www.apache.org/security/">Security</a></li>
+                    <li><a href="http://www.apache.org/" target="_blank">Apache Foundation</a></li>
+                </ul>
+            </div>
+            <div class="col-md-4">
+                <a class="twitter-timeline" href="https://twitter.com/search?q=%23usergrid" data-widget-id="401499136807038976"  data-related="usergrid" height="400px" style="overflow:hidden">Tweets about "usergrid"</a>
+                <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
+            </div> 
+        <!--
+            <div class="col-md-4">
+                <div class="input-group form-search">
+                    <input type="text" class="form-control search-query">
+                    <span class="input-group-btn">
+                        <button type="submit" class="btn btn-primary" data-type="last">Search</button>
+                    </span>
+                </div>
+            </div> -->
+        </div> 
+        <div class="row">
+            <div id="copyright">
+                <img src="/img/egg-logo.png" /><br/><br/>
+                <p>Apache Usergrid is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.</p>
+                <p>Copyright © 2013 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.<br>
+                Apache and the Apache feather logos are trademarks of The Apache Software Foundation.</p>
+                <p class="credits">Site designed & assembled with love by <a href="https://github.com/ryuneeee">@ryuneeee</a> + <a href="https://github.com/realbeast">@realbeast</a> + <a href="https://twitter.com/timanglade">@timanglade</a> + <a href="https://twitter.com/snoopdave">@snoopdave</a> .</p>
+            </div>
+        </div>
+    </div>
+</footer>
+
+<script type="text/javascript" src="/js/head.js"></script>
+<script type="text/javascript">
+    head.js("/js/jquery-1.10.1.min.js", "/js/bootstrap.min.js", "/js/usergrid-site.js");
+</script>
+<script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+  ga('create', 'UA-45815079-1', 'apache.org');
+  ga('send', 'pageview');
+
+</script>
+
+
+
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/releases/index.html
----------------------------------------------------------------------
diff --git a/content/releases/index.html b/content/releases/index.html
new file mode 100644
index 0000000..a8579ef
--- /dev/null
+++ b/content/releases/index.html
@@ -0,0 +1,235 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="utf-8">
+    <title>Apache Usergrid (incubating) — </title>
+    <meta http-equiv="x-ua-compatible" content="ie=edge" />
+    <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1" />
+    <meta name="keywords" content="Apache Usergrid, Usergrid, BaaS, Backend-as-a-Service">
+    <meta name="description" content="An open-source Backend-as-a-Service stack for web & mobile applications, based on RESTful APIs." />
+    <meta property="og:title" content="Apache Usergrid" />
+    <meta property="og:description" content="An open-source Backend-as-a-Service stack for web & mobile applications, based on RESTful APIs." />
+    <!-- Loading Typekit -->
+    <script type="text/javascript" src="//use.typekit.net/ddl7izx.js"></script>
+    <script type="text/javascript">try{Typekit.load();}catch(e){}</script>
+    <!-- Loading Bootstrap -->
+    <link href="/bootstrap/bootstrap.min.css" rel="stylesheet" type='text/css'>
+    <link href="/css/bootflat.css" rel="stylesheet" type='text/css'>
+    <link href="/css/usergrid-site.css" rel="stylesheet" type='text/css'>
+    <link href="https://fonts.googleapis.com/css?family=Open+Sans:200,400,500,300,600,800,700,400italic,600italic,700italic,800italic,300italic" rel="stylesheet" type="text/css">
+    <link href="/css/font-awesome.min.css" rel="stylesheet" type='text/css'>
+
+    
+
+    <!-- HTML5 shim, for IE6-8 support of HTML5 elements. All other JS at the end of file. -->
+    <!--[if lt IE 9]>
+      <script src="js/html5shiv.js"></script>
+      <script src="js/respond.min.js"></script>
+    <![endif]-->
+</head>
+<body>
+
+    <header class="navbar navbar-inverse navbar-fixed-top bf-docs-nav " role="banner">
+    <div class="container">
+        <div class="navbar-header">
+            <button class="navbar-toggle" type="button" data-toggle="collapse" data-target=".bf-navbar-collapse">
+                <span class="sr-only">Toggle navigation</span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+            </button>
+        </div>
+        <a href="/" class="navbar-brand">
+                <img id="home-logo" src="/img/apache_usergrid_logo_white_small.png" />
+            </a>
+        <nav class="collapse navbar-collapse bf-navbar-collapse" role="navigation">
+            <ul class="nav navbar-nav navbar-right">
+                <li class=""><a href="/community/"><span class="icns icon-group"></span></a></li>
+                <li><a href="docs" target="_blank"><span class="icns icon-book"></span></a></li>
+                <li><a href="http://github.com/apache/incubator-usergrid" target="_blank"><span class="icns icon-github-sign"></span></a></li>
+                <!--<li><a href="https://trello.com/b/exQmJIOn/usergrid" target="_blank"><span class="icns icon-trello"></span></a></li>-->
+                <li><a href="https://issues.apache.org/jira/secure/RapidBoard.jspa?rapidView=23&view=planning&selectedIssue=USERGRID-362&epics=visible" 
+                       target="_blank"><span class="icns icon-bug"></span></a></li>
+                <li><a href="http://stackoverflow.com/search?q=usergrid" target="_blank"><span class="icns icon-stackexchange"></span></a></li>
+                <li><a href="/community/#live"><span class="icns icon-comments"></span></a></li>
+                <!--<li><a href="https://groups.google.com/forum/#!forum/usergrid" target="_blank"><span class="icns icon-envelope"></span></a></li>-->
+                <li><a href="https://twitter.com/usergrid" target="_blank"><span class="icns icon-twitter"></span></a></li>
+                <li><a href="https://cwiki.apache.org/confluence/display/usergrid/" target="_blank"><span class="icns icon-wiki"></span></a></li>
+                <li><a href="/releases/"><span class="icns icon-releases"></span></a></li>
+            </ul>
+        </nav>
+    </div>
+    </header>
+
+
+
+
+<section class="bf-tagline">
+    <div class="container">
+    	<div class="row">
+    	    <div class="col-md-12">
+    	    	<h2>Usergrid Releases</h2>
+			</div>
+		</div>
+	</div>
+</section> 
+
+<section class="bf-releases">
+    <div class="container">
+    	<div class="row">
+    	    <div class="col-md-12" id="events">
+    	    	<h2 class="icns-download"><span>Releases</span></h2>
+			</div>
+		</div>
+		</br>
+		<div class="row">
+    		<div class="col-md-9 done">
+    			<p>
+				Releases of Usergrid are made available to the general public at no charge, under the <a href="http://apache.org/licenses/">Apache License</a>, in both binary and source distributions.
+				</p>
+				<p>
+					General Availability (GA) Releases - Usergrid 1.0.2
+				</p>
+				<p>
+					Download the release from a <a href="http://www.apache.org/dyn/closer.cgi/incubator/usergrid/usergrid-1/v1.0.2">mirror: http://www.apache.org/dyn/closer.cgi/incubator/usergrid/usergrid-1/v1.0.2</a>
+				</p>
+				<p>
+					Project releases are approved by vote of the Apache Usergrid (incubating) Project Management Committee (PMC). Support for a release is provided by project volunteers on the project <a href="http://usergrid.incubator.apache.org/community/#mailing-lists">mailing lists</a>. Bugs found in a release may be discussed on the list and reported through the <a href="https://issues.apache.org/jira/browse/USERGRID">issue tracker</a>. The user mailing list and issue tracker are the only support options hosted by the Apache Usergrid project.
+				</p>
+				<p>
+					Note: When downloading from a mirror, please be sure to verify that checksums and signatures are correct. To do so, use the checksum and signature files from the main Apache site at <a href="https://dist.apache.org/repos/dist/release/incubator/usergrid/usergrid-1/v1.0.2/">https://dist.apache.org/repos/dist/release/incubator/usergrid/usergrid-1/v1.0.2/</a>. Find here the KEYS file, which contains all OpenPGP keys we use to sign releases here: <a href="https://dist.apache.org/repos/dist/release/incubator/usergrid/KEYS">https://dist.apache.org/repos/dist/release/incubator/usergrid/KEYS</a>
+				</p>
+				<p>
+					The PGP signatures can be verified using PGP or GPG. First download the <a href="https://dist.apache.org/repos/dist/release/incubator/usergrid/KEYS">KEYS</a> as well as the <a href="https://dist.apache.org/repos/dist/release/incubator/usergrid/usergrid-1/v1.0.2/">asc signature</a> file for the particular distribution. Then verify the signatures using:
+				</p>
+				<p>
+       				% pgpk -a KEYS
+					</br></br>
+        			% pgpv ${filename}.tar.gz.asc
+        			</br></br>
+    				or
+    				</br></br>
+        			% pgp -ka KEYS
+        			</br></br>
+        			% pgp ${filename}.tar.gz.asc
+        			</br></br>
+    				or
+    				</br></br>
+        			% gpg --import KEYS
+        			</br></br>
+        			% gpg --verify ${filename}.tar.gz.asc
+        			</br></br>
+        		</p>
+    			<p>
+					Alternatively, you can verify the MD5 signature on the files. A Unix program called md5 or md5sum is included in many Unix distributions. It is also available as part of <a href="http://www.gnu.org/software/textutils/textutils.html">GNU Textutils</a>. Windows users can get binary md5 programs from <a href="http://www.fourmilab.ch/md5/">here</a>, <a href="http://www.pc-tools.net/win32/md5sums/">here</a>, or <a href="http://www.slavasoft.com/fsum/">here</a>.
+				<p>
+					If you want to build directly from the sources, please check the <a href="/docs/getting-up-and-running-locally/">Project Docs</a>.
+				</p>
+			</div>
+		</div>
+	</div>
+</section>
+
+
+
+
+<footer class="bf-footer" role="contentinfo">
+    <div class="container">
+        <div class="row">
+            <div class="col-md-2">
+                <ul class="nav nav-list">
+                    <li class="nav-header"><a href="/">Home</a></li>
+                    <li class="nav-header"><a href="/community/">Community</a></li>
+                        <li><a href="/community/#events">Events</a></li>
+                        <li><a href="/community/#mailing-lists">Mailing Lists</a></li>
+                        <li><a href="/community/#deployments">Deployments</a></li>
+                        <li><a href="/community/#committers">Commiters</a></li>
+                </ul>
+            </div>
+            <div class="col-md-2">
+                <ul class="nav nav-list">
+                    <li class="nav-header"><a href="https://github.com/apache/incubator-usergrid/" target="_blank">Code</a></li>
+                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/stack" target="_blank">Server Stack</a></li>
+                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/portal" target="_blank">Admin Portal</a></li>
+                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/ugc" target="_blank">ugc command line</a></li>
+                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/ios" target="_blank">iOS SDK</a></li>
+                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/android" target="_blank">Android SDK</a></li>
+                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/html5-javascript" target="_blank">HTML5/JS SDK</a></li>
+                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/nodejs" target="_blank">node.js module</a></li>
+                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/ruby-on-rails" target="_blank">Ruby on Rails gem</a></li>
+                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/ruby" target="_blank">Ruby gem</a></li>
+                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/php" target="_blank">PHP SDK</a></li>
+                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/java" target="_blank">Java SDK</a></li>
+                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/sdks/dotnet" target="_blank">.NET / Windows SDK</a></li>
+                </ul>
+            </div>
+            <div class="col-md-2">
+                <ul class="nav nav-list">
+                    <li class="nav-header">Resources</li>
+                    <li><a href="http://github.com/apache/incubator-usergrid" target="_blank">GitHub Code</a></li>
+                    <li><a href="docs" target="_blank">Docs</a></li>
+                    <li><a href="https://issues.apache.org/jira/secure/RapidBoard.jspa?rapidView=23&view=planning&selectedIssue=USERGRID-362&epics=visible" target="_blank">JIRA Bug Tracker</a></li>
+                    <li><a href="http://stackoverflow.com/search?q=usergrid" target="_blank">StackOverflow</a></li>
+                    <li><a href="/community/#live">Live Chat</a></li>
+                    <li><a href="https://twitter.com/usergrid" target="_blank">Twitter</a></li>
+                    <li><a href="http://incubator.apache.org/projects/usergrid.html" target="_blank">Podling Listing</a></li>
+                    <li><a href="https://github.com/apache/incubator-usergrid/blob/master/stack#requirements" target="_blank">Getting Started</a></li>
+                    <li><a href="https://cwiki.apache.org/confluence/display/usergrid/GitHub+Based+Contribution+Workflow" target="_blank">Contribution Guidelines</a></li>
+                </ul>
+            </div>
+            <div class="col-md-2">
+                <ul class="nav nav-list">
+                    <li class="nav-header">Apache</li>
+                    <li><a href="http://www.apache.org/licenses/" target="_blank">License</a></li>
+                    <li><a href="http://www.apache.org/foundation/sponsorship.html" target="_blank">Sponsorship</a></li>
+                    <li><a href="http://www.apache.org/foundation/thanks.html" target="_blank">Thanks</a></li>
+                    <li><a href="http://www.apache.org/security/">Security</a></li>
+                    <li><a href="http://www.apache.org/" target="_blank">Apache Foundation</a></li>
+                </ul>
+            </div>
+            <div class="col-md-4">
+                <a class="twitter-timeline" href="https://twitter.com/search?q=%23usergrid" data-widget-id="401499136807038976"  data-related="usergrid" height="400px" style="overflow:hidden">Tweets about "usergrid"</a>
+                <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
+            </div> 
+        <!--
+            <div class="col-md-4">
+                <div class="input-group form-search">
+                    <input type="text" class="form-control search-query">
+                    <span class="input-group-btn">
+                        <button type="submit" class="btn btn-primary" data-type="last">Search</button>
+                    </span>
+                </div>
+            </div> -->
+        </div> 
+        <div class="row">
+            <div id="copyright">
+                <img src="/img/egg-logo.png" /><br/><br/>
+                <p>Apache Usergrid is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.</p>
+                <p>Copyright © 2013 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.<br>
+                Apache and the Apache feather logos are trademarks of The Apache Software Foundation.</p>
+                <p class="credits">Site designed & assembled with love by <a href="https://github.com/ryuneeee">@ryuneeee</a> + <a href="https://github.com/realbeast">@realbeast</a> + <a href="https://twitter.com/timanglade">@timanglade</a> + <a href="https://twitter.com/snoopdave">@snoopdave</a> .</p>
+            </div>
+        </div>
+    </div>
+</footer>
+
+<script type="text/javascript" src="/js/head.js"></script>
+<script type="text/javascript">
+    head.js("/js/jquery-1.10.1.min.js", "/js/bootstrap.min.js", "/js/usergrid-site.js");
+</script>
+<script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+  ga('create', 'UA-45815079-1', 'apache.org');
+  ga('send', 'pageview');
+
+</script>
+
+
+
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/docs/README.md
----------------------------------------------------------------------
diff --git a/docs/README.md b/docs/README.md
index 9f65b40..07ab32b 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,8 +1,6 @@
 # Apache Usergrid Documentation
 
-Usergrid documentation is written in [Markdown](https://help.github.com/articles/markdown-basics/) 
-(*.md) and RST (.rst) formats and we use the Python based [Sphinx-Docs](http://sphinx-doc.org/) 
-documentation system to transform our Markdown and RST files to HTML format.
+Usergrid documentation is written in [Markdown](https://help.github.com/articles/markdown-basics/) (*.md) and RST (.rst) formats and we use the Python based [Sphinx-Docs](http://sphinx-doc.org/) documentation system to transform our Markdown and RST files to HTML format.
 
 ## Prerequisites
 
@@ -11,39 +9,45 @@ Sphinx requires Python and pip. Once you have Python, you can install sphinx and
 	$ sudo easy_install sphinx
 	$ sudo easy_install pip
 
-## How to the Usergrid documentation using Sphinx
+## How to build the Usergrid documentation using Sphinx
 
 Sphinx runs via a Makefile in this, the docs directory. So, cd to this directory and make html:
 
 	cd $usergrid/docs
 	make clean html
 
-## How to update documentations in Usergrid site
+## How to update the Usergrid docs 
 
-For most changes you simply edit the Markdown (.md) and reST (.rst) files where and 
-commit your changes to Git.
+Find the Markdown (.md) or reST (.rst) files that you need to change, edit them and then run ``make clean html`` to generate the HTML into the ``target/html`` directory, where you can preview your changes. 
 
 ### Note the difference between RST and Markdown files
 
-Note that Sphinx's native format is [reStructuredText](http://docutils.sourceforge.net/rst.html) 
-(RST) and not Markdown. This causes some issues. For example, using Sphinx directives in 
-Markdown files sometimes works and sometimes does not. RST is a different format than Markdown 
-and it has a different set of directives, some very useful for organizing a large set of 
-documentation files.
+Note that Sphinx's native format is [reStructuredText](http://docutils.sourceforge.net/rst.html) (RST) and not Markdown. This causes some issues. For example, using Sphinx directives in Markdown files sometimes works and sometimes does not. RST is a different format than Markdown and it has a different set of directives, some very useful for organizing a large set of documentation files.
 
-### The Table of Contents
+### Updating the Table of Contents
 
 The Table of Contents for the documentation is in index.rst, which ties everything together
 with a series of RST __toctree__ directives. All other files should be written in Markdown,
 unless they need some special RST directives that will not work in Markdown.
 
-### Other Tables
+### Dealing with other tables
 
-A note about tables: simple tables are easy and you can find examples (e.g. connecting-entities.md) 
-but for tables with multiple lines in each cell, you'll probably want to use a raw HTML table,
-and there are plenty of examples of that around too.
+A note about tables. Markdown and reST do not have very good table support. Simple tables are easy to do and you can find examples (e.g. connecting-entities.md) but for tables with multiple lines in each cell, you'll probably want to use a raw HTML table, and there are plenty of examples of that around too.
 
-### The REST API documentation 
+## How to publish the Usergrid docs to Usergrid website
+
+First you generate the HTML for the docs from the Markdown and reST sources like so:
+
+	cd $usergrid/docs
+	make clean html
+	
+To update the Usergrid website you must copy the udpated docs files from ``target/html`` directory to the website directory at the root of the Usergrid project, i.e. ``${usergrid-project-dir}/website/docs``.
+
+You can do this by running the script ``update-website.sh``.
+
+Once you've done that then you should follow the instructions in the website/README.md file, which explains how to update the website.
+
+## Updating the REST API reference
 
 The REST API documentation in ``rest-endpoints/api-docs.md`` is generated from a Swagger file in the 
 directory ``src/main/resources``, so DO NOT edit that file directly.
@@ -51,19 +55,16 @@ directory ``src/main/resources``, so DO NOT edit that file directly.
 If you need to update the REST API docs, you should edit the usergrid-swagger.yaml file and then
  re-generate the file. 
 
-If you need to change the formatting of the REST API docs, then you will need to edit the Mustache
-templates in ``src/main/resource`` and you may need to edit the Groovy script that does the 
-generation: ``src/main/groovy/usergrid.ApiDocGenerator``.
+If you need to change the formatting of the REST API docs, then you will need to edit the Mustache templates in ``src/main/resource`` and you may need to edit the Groovy script that does the generation: ``src/main/groovy/usergrid.ApiDocGenerator``.
  
 You will need:
 * Groovy 2.x
 * [Mustache.java](https://github.com/spullara/mustache.java) 
 
-Unfortunately, you will have to Git Clone Mustatche.java before you can run the generation script.
+__NOTE__: Mustache.hava is not in Maven Central so unfortunately, you will have to Git Clone Mustache.java before you can run the generation script.
 
 This is the command to run the generation:
 
 	groovy src/main/groovy/usergrid.ApiDocGenerator.groovy
 	
-The script will update the file ``rest-endpoints/api-docs.md`` and when you are happy with your
-update you should commit and push that file with Git.
+The script will update the file ``rest-endpoints/api-docs.md`` and when you are happy with your update you should commit and push that file with Git.

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/docs/update-api-docs.sh
----------------------------------------------------------------------
diff --git a/docs/update-api-docs.sh b/docs/update-api-docs.sh
index e07eabf..0885773 100755
--- a/docs/update-api-docs.sh
+++ b/docs/update-api-docs.sh
@@ -1,2 +1,4 @@
-groovy src/main/groovy/ApiDocGenerator.groovy 
+#!/usr/bin/env bash
 
+# Updating API Docs requires Mustache.java
+groovy src/main/groovy/ApiDocGenerator.groovy 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/docs/update-website.sh
----------------------------------------------------------------------
diff --git a/docs/update-website.sh b/docs/update-website.sh
new file mode 100755
index 0000000..691e3cf
--- /dev/null
+++ b/docs/update-website.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+# make dcoumenatation and copy to website directry
+make clean html 
+cp -r target/html/* ../content/docs
+

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/website/README.md
----------------------------------------------------------------------
diff --git a/website/README.md b/website/README.md
new file mode 100644
index 0000000..bea925e
--- /dev/null
+++ b/website/README.md
@@ -0,0 +1,54 @@
+# Apache Usergrid Website
+
+This directory contains the source files for the project website. Website content is written in [Markdown](https://help.github.com/articles/markdown-basics) and the site files are generated from that source by a tool called [Pandoc](http://johnmacfarlane.net/pandoc).
+
+Source files for the website are in ``${usergrid-project-dir}/website/content``
+
+Generated files for the website are in ``${usergrid-project-dir}/content``
+
+The website is updated by a "sync" tool that monitors the __asf-site__ branch of our Git repo, so after to make changes you must push your updated source and generated files to that branch. 
+The content will be published to the [Usegrid website](http://usergrid.incubator.apache.org), after a 5-20 minute delay. 
+
+## Prerequsites
+
+To generate the site locally, you need Ruby, Python, Pandoc and a couple of Ruby Gems. 
+
+Install Pandoc (Haskell-based markup format converter):
+
+    http://johnmacfarlane.net/pandoc/installing.html
+
+Install Pygments (Python-basd syntax coloring library):
+
+    $ sudo easy_install Pygments
+
+Install Nanoc and other Ruby Gems needed:
+
+    $ sudo gem install nanoc pygments.rb htmlentities pandoc-ruby nokogiri rack mime-types
+
+## How to change/update the website 
+
+### 1. Find and edit the source files you need to change
+
+Generally, you should make your changes in the __master__ branch unless you have a very good reason to do otherwise. When you're ready to publish, merge them to the __asf-site__ branch.
+
+If you are changing the actual content of the site, then find Markdown file that you need to edit under the ``content/docs`` directory and make your change.
+
+If you need to change the layout or styling of the site, then you will probably need to change an HTML, JS or CSS file under the ``content`` directory.
+
+## 2. Test your changes locally
+
+To test locally, you can use the autocompiler (will build changes on every request) and check the website at [http://0.0.0.0:3000](http://0.0.0.0:3000)
+
+    $ nanoc autocompile
+    
+## 3. Publish your changes to the site    
+
+Run the nanoc compiler to generate the . It is configured via the ``nanoc.yaml`` to place website files into the ``content`` directory at the top 
+
+    $ nanoc compile
+
+Run ``git status`` and you should see your changes plus some update files under the ``${usergrid-project-dir}/content`` directory. 
+
+Once you are happy with your changes, commit them, merge to the __asf-site__ branch and push.
+
+The site should update in 5-10 minutes and if not [file a JIRA against the INFRA project](https://issues.apache.org/jira/browse/INFRA) or ask for advice on the Infrastructure project's HipChat room [#asfinfra](https://www.hipchat.com/g4P84gemn). 

[35/60] [abbrv] incubator-usergrid git commit: cherry picking docs from master

[sn...@apache.org]

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/rest-endpoints/api-docs.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/rest-endpoints/api-docs.txt b/content/docs/_sources/rest-endpoints/api-docs.txt
new file mode 100644
index 0000000..93a6e32
--- /dev/null
+++ b/content/docs/_sources/rest-endpoints/api-docs.txt
@@ -0,0 +1,3319 @@
+## Methods
+### Action Methods
+
+<h2 class="usergrid-GET-heading">GET /management/orgs/{orgId}/activate</h2>
+
+Activate an organization from a link provIded in an email notification.
+
+<h3>Parameters</h3>
+
+* __orgId__ (string)
+One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+* __token__ ()
+Activation token. (Specified in query).
+* __confirm_email__ ()
+Send confirmation email or not. (Specified in query).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of complete messages.
+* Schema: [Action](#action)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+
+<h2 class="usergrid-GET-heading">GET /management/orgs/{orgId}/reactivate</h2>
+
+Reactivate an expired organization.
+
+<h3>Parameters</h3>
+
+* __orgId__ (string)
+One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of complete messages.
+* Schema: [Action](#action)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+
+<h2 class="usergrid-GET-heading">GET /management/users/resetpw</h2>
+
+Initiate the reset of an admin user&#39;s password.
+
+<h3>Parameters</h3>
+
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of complete messages.
+* Schema: [Action](#action)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+
+<h2 class="usergrid-POST-heading">POST /management/users/resetpw</h2>
+
+Complete the password reset through getting the newpassword and the old one for identification.
+
+<h3>Parameters</h3>
+
+* __ResetPWMsg__ ([ResetPWMsg](#resetpwmsg))
+Parameters and value for the Captcha challenge, the admin user&#39;s response to the Captcha challenge, and the admin user&#39;s email address. (Specified in body).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of complete messages.
+* Schema: [Action](#action)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+
+<h2 class="usergrid-GET-heading">GET /management/users/{userId}/activate</h2>
+
+Activate an admin user from a link provIded in an email notification.
+
+<h3>Parameters</h3>
+
+* __userId__ (string)
+One of the user&#39;s identification which includes username, real name, email address or UUID. (Specified in path).
+* __token__ ()
+Activation token&#39;s query statement. (Specified in query).
+* __confirm_email__ ()
+Query statement of whether send confimation email or not. (Specified in query).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of complete messages.
+* Schema: [Action](#action)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+
+<h2 class="usergrid-PUT-heading">PUT /management/users/{userId}/password</h2>
+
+Update an admin user&#39;s password through getting the newpassword and the old one for identification.
+
+<h3>Parameters</h3>
+
+* __userId__ (string)
+One of the user&#39;s identification which includes username, real name, email address or UUID. (Specified in path).
+* __ResetPW__ ([ResetPW](#resetpw))
+The user&#39;s old and new password. (Specified in body).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of complete messages.
+* Schema: [Action](#action)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+
+<h2 class="usergrid-GET-heading">GET /management/users/{userId}/reactivate</h2>
+
+Reactivate an expired admin user.
+
+<h3>Parameters</h3>
+
+* __userId__ (string)
+One of the user&#39;s identification which includes username, real name, email address or UUID. (Specified in path).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of complete messages.
+* Schema: [Action](#action)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+
+<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/users/{user}/password</h2>
+
+Set a user&#39;s password or reset the user&#39;s existing password.
+
+<h3>Parameters</h3>
+
+* __orgId__ (string)
+One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+* __appId__ (string)
+One of the application&#39;s identification which includes name or uuid. (Specified in path).
+* __username__ (string)
+The username of the user. (Specified in path).
+* __ResetPW__ ([ResetPW](#resetpw))
+The user&#39;s old and new password. (Specified in body).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of complete messages.
+* Schema: [Action](#action)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+### ActivityFeed Methods
+
+<h2 class="usergrid-GET-heading">GET /management/orgs/{orgId}/feed</h2>
+
+Retrieve an organization&#39;s activity feed.
+
+<h3>Parameters</h3>
+
+* __orgId__ (string)
+One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of the organization&#39;s ActivityFeed.
+* Schema: [ActivityFeed](#activityfeed)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+
+<h2 class="usergrid-GET-heading">GET /management/users/{userId}/feed</h2>
+
+Retrieve an admin user&#39;s activity feed.
+
+<h3>Parameters</h3>
+
+* __userId__ (string)
+One of the user&#39;s identification which includes username, real name, email address or UUID. (Specified in path).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of user&#39;s activity
+* Schema: [ActivityFeed](#activityfeed)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+
+<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/groups/{groupId}/activities</h2>
+
+Create an activity to a specific group. In this case the activity is created in the activities collection and is accessible at the /activities endpoint to users who have the permission to read that endpoint. In addition, a relationship is established between the activity and the group, and because of that, the activity will appear in the group’s feed. The group &#39;owns&#39; the activity. Also, the activity will be published in the feed of all users that are members of the group.
+
+<h3>Parameters</h3>
+
+* __orgId__ (string)
+One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+* __appId__ (string)
+One of the application&#39;s identification which includes name or uuid. (Specified in path).
+* __groupId__ (string)
+One of the group&#39;s identification which includes name or uuid. (Specified in path).
+* __CreateActivity__ ([CreateActivity](#createactivity))
+One or more sets of activity properties. (Specified in body).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of user&#39;s activity.
+* Schema: [ActivityFeed](#activityfeed)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+
+<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/groups/{groupId}/feed</h2>
+
+Get a group&#39;s feed through providing all the identifications.
+
+<h3>Parameters</h3>
+
+* __orgId__ (string)
+One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+* __appId__ (string)
+One of the application&#39;s identification which includes name or uuid. (Specified in path).
+* __groupId__ (string)
+One of the group&#39;s identification which includes name or uuid. (Specified in path).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of group&#39;s activity.
+* Schema: [ActivityFeed](#activityfeed)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+
+<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/users/{userId}/activities</h2>
+
+Create an activity in the activities collection.
+
+<h3>Parameters</h3>
+
+* __orgId__ (string)
+One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+* __appId__ (string)
+One of the application&#39;s identification which includes name or uuid. (Specified in path).
+* __userId-3__ (string)
+One of the user&#39;s identification which includes username or UUID. (Specified in path).
+* __CreateActivity__ ([CreateActivity](#createactivity))
+One or more sets of activity properties. (Specified in body).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of user&#39;s activity.
+* Schema: [ActivityFeed](#activityfeed)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+
+<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/users/{userId}/feed</h2>
+
+Retrieve a user&#39;s feed through providing all the identifications.
+
+<h3>Parameters</h3>
+
+* __orgId__ (string)
+One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+* __appId__ (string)
+One of the application&#39;s identification which includes name or uuid. (Specified in path).
+* __userId-3__ (string)
+One of the user&#39;s identification which includes username or UUID. (Specified in path).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of user&#39;s activity feed.
+* Schema: [ActivityFeed](#activityfeed)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+### AppData Methods
+
+<h2 class="usergrid-GET-heading">GET /management/orgs/{orgId}/apps</h2>
+
+Retrieve the applications in an organization through providing both Id of application and organization.
+
+<h3>Parameters</h3>
+
+* __orgId__ (string)
+One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of retrieved application data.
+* Schema: [AppData](#appdata)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+
+<h2 class="usergrid-DELETE-heading">DELETE /management/orgs/{orgId}/apps/{appId}</h2>
+
+Remove an application from an organization through providing both Id of application and organization.
+
+<h3>Parameters</h3>
+
+* __orgId__ (string)
+One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+* __appId__ (string)
+One of the application&#39;s identification which includes name or uuid. (Specified in path).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of deleted application info.
+* Schema: [AppData](#appdata)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+### Credential Methods
+
+<h2 class="usergrid-GET-heading">GET /management/orgs/{orgId}/apps/{appId}/credentials</h2>
+
+Retrieve the client Id and client secret credentials for an application in an organization.
+
+<h3>Parameters</h3>
+
+* __orgId__ (string)
+One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+* __appId__ (string)
+One of the application&#39;s identification which includes name or uuid. (Specified in path).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of retrieved credentials info.
+* Schema: [Credential](#credential)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+
+<h2 class="usergrid-POST-heading">POST /management/orgs/{orgId}/apps/{appId}/credentials</h2>
+
+Generate the client Id and client secret credentials for an application in an organization.
+
+<h3>Parameters</h3>
+
+* __orgId__ (string)
+One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+* __appId__ (string)
+One of the application&#39;s identification which includes name or uuid. (Specified in path).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of generated credentials info.
+* Schema: [Credential](#credential)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+
+<h2 class="usergrid-GET-heading">GET /management/orgs/{orgId}/credentials</h2>
+
+Retrieve the credentials for an organization client.
+
+<h3>Parameters</h3>
+
+* __orgId__ (string)
+One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of Credential
+* Schema: [Credential](#credential)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+
+<h2 class="usergrid-POST-heading">POST /management/orgs/{orgId}/credentials</h2>
+
+Generate whole new credentials for an organization client.
+
+<h3>Parameters</h3>
+
+* __orgId__ (string)
+One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of Credential
+* Schema: [Credential](#credential)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+### Devices Methods
+
+<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/{notificationId}/*/queue</h2>
+
+Retrieve the list of devices associated with one or more notifications before the notifications are sent through providing all the identifications.
+
+<h3>Parameters</h3>
+
+* __orgId__ (string)
+One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+* __appId__ (string)
+One of the application&#39;s identification which includes name or uuid. (Specified in path).
+* __notificationId__ (string)
+One of the notification&#39;s identification which includes name or uuid. (Specified in path).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of retrieved device&#39;s info.
+* Schema: [Device](#device)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+### Entity Methods
+
+<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/users/{userId}/{relation}</h2>
+
+Retrieve a user&#39;s collections or connections through query statement.
+
+<h3>Parameters</h3>
+
+* __orgId__ (string)
+One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+* __appId__ (string)
+One of the application&#39;s identification which includes name or uuid. (Specified in path).
+* __userId-3__ (string)
+One of the user&#39;s identification which includes username or UUID. (Specified in path).
+* __relation__ (string)
+The relation between user and collections. (Specified in path).
+* __queryStatement__ ()
+The query statement of the user. (Specified in query).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of user&#39;s collections info.
+* Schema: [Entity](#entity)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+
+<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/{collectionId}</h2>
+
+Retrieve collection through query statement.
+
+<h3>Parameters</h3>
+
+* __orgId__ (string)
+One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+* __appId__ (string)
+One of the application&#39;s identification which includes name or uuid. (Specified in path).
+* __collectionId__ (string)
+One of the collection&#39;s identification which includes name or uuid. (Specified in path).
+* __queryStatement__ ()
+Any values specified in the query statement should be enclosed in single-quotes. (Specified in query).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of retrieved collection&#39;s info.
+* Schema: [Entity](#entity)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+
+<h2 class="usergrid-PUT-heading">PUT /{orgId}/{appId}/{collectionId}</h2>
+
+Update collection through query statement.
+
+<h3>Parameters</h3>
+
+* __orgId__ (string)
+One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+* __appId__ (string)
+One of the application&#39;s identification which includes name or uuid. (Specified in path).
+* __collectionId__ (string)
+One of the collection&#39;s identification which includes name or uuid. (Specified in path).
+* __queryStatement__ ()
+Any values specified in the query statement should be enclosed in single-quotes. (Specified in query).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of updated collection&#39;s info.
+* Schema: [Entity](#entity)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+
+<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/{collectionId}/{entityId1}/{relation}/{entityId2}</h2>
+
+Add an entity to a collection through providing all the identifications.
+
+<h3>Parameters</h3>
+
+* __orgId__ (string)
+One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+* __appId__ (string)
+One of the application&#39;s identification which includes name or uuid. (Specified in path).
+* __collectionId__ (string)
+One of the collection&#39;s identification which includes name or uuid. (Specified in path).
+* __entityId1__ (string)
+The Id of the 1st entity. (Specified in path).
+* __relation__ (string)
+The relation between 1st entity and 2nd entity. (Specified in path).
+* __entityId2__ (string)
+The Id of the 2nd entity. (Specified in path).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of added entity&#39;s info.
+* Schema: [Entity](#entity)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+
+<h2 class="usergrid-DELETE-heading">DELETE /{orgId}/{appId}/{collectionId}/{entityId1}/{relation}/{entityId2}</h2>
+
+Remove an entity from a collection through providing all the identifications.
+
+<h3>Parameters</h3>
+
+* __orgId__ (string)
+One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+* __appId__ (string)
+One of the application&#39;s identification which includes name or uuid. (Specified in path).
+* __collectionId__ (string)
+One of the collection&#39;s identification which includes name or uuid. (Specified in path).
+* __entityId1__ (string)
+The Id of the 1st entity. (Specified in path).
+* __relation__ (string)
+The relation between 1st entity and 2nd entity. (Specified in path).
+* __entityId2__ (string)
+The Id of the 2nd entity. (Specified in path).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of deleted entity&#39;s info.
+* Schema: [Entity](#entity)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+
+<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/{collectionId}/{entityId}</h2>
+
+Retrieve an entity through providing Id of application, organization, collection and entity.
+
+<h3>Parameters</h3>
+
+* __orgId__ (string)
+One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+* __appId__ (string)
+One of the application&#39;s identification which includes name or uuid. (Specified in path).
+* __collectionId__ (string)
+One of the collection&#39;s identification which includes name or uuid. (Specified in path).
+* __entityId__ (string)
+One of the entity&#39;s identification which includes name or uuid. (Specified in path).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of retrieved entity&#39;s info.
+* Schema: [Entity](#entity)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+
+<h2 class="usergrid-PUT-heading">PUT /{orgId}/{appId}/{collectionId}/{entityId}</h2>
+
+One or more properties can be updated with a single request.
+
+<h3>Parameters</h3>
+
+* __orgId__ (string)
+One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+* __appId__ (string)
+One of the application&#39;s identification which includes name or uuid. (Specified in path).
+* __collectionId__ (string)
+One of the collection&#39;s identification which includes name or uuid. (Specified in path).
+* __entityId__ (string)
+One of the entity&#39;s identification which includes name or uuid. (Specified in path).
+* __entityproperty__ ([CreateEntities](#createentities))
+The properties of the entity. (Specified in body).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of updated entity&#39;s info.
+* Schema: [Entity](#entity)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+
+<h2 class="usergrid-DELETE-heading">DELETE /{orgId}/{appId}/{collectionId}/{entityId}</h2>
+
+Delete an entity from the collection.
+
+<h3>Parameters</h3>
+
+* __orgId__ (string)
+One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+* __appId__ (string)
+One of the application&#39;s identification which includes name or uuid. (Specified in path).
+* __collectionId__ (string)
+One of the collection&#39;s identification which includes name or uuid. (Specified in path).
+* __entityId__ (string)
+One of the entity&#39;s identification which includes name or uuid. (Specified in path).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of deleted entity&#39;s info.
+* Schema: [Entity](#entity)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+
+<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/{entitytype}</h2>
+
+When a new entity is created, Usergrid will automatically create a corresponding collection if one does not already exist. The collection will automatically be named with the plural form of the entity type. 
+
+<h3>Parameters</h3>
+
+* __orgId__ (string)
+One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+* __appId__ (string)
+One of the application&#39;s identification which includes name or uuid. (Specified in path).
+* __entitytype__ (string)
+The entity type to create. (Specified in path).
+* __entityproperty__ ([CreateEntities](#createentities))
+The properties of the entity. (Specified in body).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of created custom entity&#39;s info.
+* Schema: [Entity](#entity)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+### Event Methods
+
+<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/events</h2>
+
+Create an event through providing both Id of organization and application.
+
+<h3>Parameters</h3>
+
+* __orgId__ (string)
+One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+* __appId__ (string)
+One of the application&#39;s identification which includes name or uuid. (Specified in path).
+* __CreateEvent__ ([CreateEvent](#createevent))
+The required property of the event. (Specified in body).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of created event&#39;s info.
+* Schema: [Event](#event)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+### Group Methods
+
+<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/groups</h2>
+
+Create a new group through providing both Id of organization and application.
+
+<h3>Parameters</h3>
+
+* __orgId__ (string)
+One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+* __appId__ (string)
+One of the application&#39;s identification which includes name or uuid. (Specified in path).
+* __groupproperty__ ([CreateGroup](#creategroup))
+The property of the created group. (Specified in body).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of created group&#39;s info.
+* Schema: [Group](#group)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+
+<h2 class="usergrid-GET-heading">GET /{org_Id}/{app_Id}/groups/{groupId}</h2>
+
+Get a group through through providing all the identifications.
+
+<h3>Parameters</h3>
+
+* __orgId__ (string)
+One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+* __appId__ (string)
+One of the application&#39;s identification which includes name or uuid. (Specified in path).
+* __groupId__ (string)
+One of the group&#39;s identification which includes name or uuid. (Specified in path).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of retrieved group&#39;s info.
+* Schema: [Group](#group)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+
+<h2 class="usergrid-PUT-heading">PUT /{org_Id}/{app_Id}/groups/{groupId}</h2>
+
+Update a group through providing all the identifications.
+
+<h3>Parameters</h3>
+
+* __orgId__ (string)
+One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+* __appId__ (string)
+One of the application&#39;s identification which includes name or uuid. (Specified in path).
+* __groupId__ (string)
+One of the group&#39;s identification which includes name or uuid. (Specified in path).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of updated group&#39;s info.
+* Schema: [Group](#group)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+### Notification Methods
+
+<h2 class="usergrid-PUT-heading">PUT /my-org/sandbox/notifications/{notificationId}</h2>
+
+Cancel sent notifications through providing the Id of the notification.
+
+<h3>Parameters</h3>
+
+* __notificationId__ (string)
+One of the notification&#39;s identification which includes name or uuid. (Specified in path).
+* __cancelMsg__ ([CancelMSG](#cancelmsg))
+Indicete whether is canceled or not. (Specified in body).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of canceled notification&#39;s info.
+* Schema: [Notification](#notification)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+
+<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/devices</h2>
+
+Create notifications for user through targeting by location and providing all the identifications.
+
+<h3>Parameters</h3>
+
+* __orgId__ (string)
+One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+* __appId__ (string)
+One of the application&#39;s identification which includes name or uuid. (Specified in path).
+* __notification__ ([CreateNotifications](#createnotifications))
+These parameters are used when forming the notification portion of the request. (Specified in body).
+* __scheduleNotification__ ([ScheduleNotification](#schedulenotification))
+To schedule a notification for a later time add the deliver parameter with a UNIX timestamp to the body of your request. (Specified in body).
+* __setExpiration__ ([SetExpiration](#setexpiration))
+If a push service can&#39;t deliver a message to a device and needs to resend it you can set a notification to expire after a certain date/time. (Specified in body).
+* __queryStatement__ ()
+The query statement of the location of the user. (Specified in query).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of created notification&#39;s info.
+* Schema: [Notification](#notification)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+
+<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/devices/*/notifications</h2>
+
+Create notifications for all devices. This request will target all device entities.
+
+<h3>Parameters</h3>
+
+* __orgId__ (string)
+One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+* __appId__ (string)
+One of the application&#39;s identification which includes name or uuid. (Specified in path).
+* __notification__ ([CreateNotifications](#createnotifications))
+These parameters are used when forming the notification portion of the request. (Specified in body).
+* __scheduleNotification__ ([ScheduleNotification](#schedulenotification))
+To schedule a notification for a later time add the deliver parameter with a UNIX timestamp to the body of your request. (Specified in body).
+* __setExpiration__ ([SetExpiration](#setexpiration))
+If a push service can&#39;t deliver a message to a device and needs to resend it you can set a notification to expire after a certain date/time. (Specified in body).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of created notification&#39;s info.
+* Schema: [Notification](#notification)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+
+<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/devices/{deviceId}/notifications</h2>
+
+Create notifications for a single device. This request will target a specific device entity.
+
+<h3>Parameters</h3>
+
+* __orgId__ (string)
+One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+* __appId__ (string)
+One of the application&#39;s identification which includes name or uuid. (Specified in path).
+* __deviceId__ (string)
+One of the device&#39;s identification which includes name or uuid. (Specified in path).
+* __notification__ ([CreateNotifications](#createnotifications))
+These parameters are used when forming the notification portion of the request. (Specified in body).
+* __scheduleNotification__ ([ScheduleNotification](#schedulenotification))
+To schedule a notification for a later time add the deliver parameter with a UNIX timestamp to the body of your request. (Specified in body).
+* __setExpiration__ ([SetExpiration](#setexpiration))
+If a push service can&#39;t deliver a message to a device and needs to resend it you can set a notification to expire after a certain date/time. (Specified in body).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of created notification&#39;s info.
+* Schema: [Notification](#notification)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+
+<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/groups/{path}/notifications</h2>
+
+Create notifications for a group. This request will target all users associated with a specific group entity.
+
+<h3>Parameters</h3>
+
+* __orgId__ (string)
+One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+* __appId__ (string)
+One of the application&#39;s identification which includes name or uuid. (Specified in path).
+* __path__ (string)
+The path of the group. (Specified in path).
+* __notification__ ([CreateNotifications](#createnotifications))
+These parameters are used when forming the notification portion of the request. (Specified in body).
+* __scheduleNotification__ ([ScheduleNotification](#schedulenotification))
+To schedule a notification for a later time add the deliver parameter with a UNIX timestamp to the body of your request. (Specified in body).
+* __setExpiration__ ([SetExpiration](#setexpiration))
+If a push service can&#39;t deliver a message to a device and needs to resend it you can set a notification to expire after a certain date/time. (Specified in body).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of created notification&#39;s info.
+* Schema: [Notification](#notification)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+
+<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/notifications</h2>
+
+Retrieve one or more notifications through providing all the identifications.
+
+<h3>Parameters</h3>
+
+* __orgId__ (string)
+One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+* __appId__ (string)
+One of the application&#39;s identification which includes name or uuid. (Specified in path).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of retrieved notification&#39;s info.
+* Schema: [Notification](#notification)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+
+<h2 class="usergrid-DELETE-heading">DELETE /{orgId}/{appId}/notifications/{notificationId}</h2>
+
+Remove unsent notifications through providing all the identifications.
+
+<h3>Parameters</h3>
+
+* __orgId__ (string)
+One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+* __appId__ (string)
+One of the application&#39;s identification which includes name or uuid. (Specified in path).
+* __notificationId__ (string)
+One of the notification&#39;s identification which includes name or uuid. (Specified in path).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of deleted notification&#39;s info.
+* Schema: [Notification](#notification)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+
+<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/users/{userId}/notifications</h2>
+
+Create notifications for a user. This request will target a specific user entity.
+
+<h3>Parameters</h3>
+
+* __orgId__ (string)
+One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+* __appId__ (string)
+One of the application&#39;s identification which includes name or uuid. (Specified in path).
+* __userId-3__ (string)
+One of the user&#39;s identification which includes username or UUID. (Specified in path).
+* __notification__ ([CreateNotifications](#createnotifications))
+These parameters are used when forming the notification portion of the request. (Specified in body).
+* __scheduleNotification__ ([ScheduleNotification](#schedulenotification))
+To schedule a notification for a later time add the deliver parameter with a UNIX timestamp to the body of your request. (Specified in body).
+* __setExpiration__ ([SetExpiration](#setexpiration))
+If a push service can&#39;t deliver a message to a device and needs to resend it you can set a notification to expire after a certain date/time. (Specified in body).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of created notification&#39;s info.
+* Schema: [Notification](#notification)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+
+<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/{receiptId}/*/notifications</h2>
+
+Retrieve notifications associated with one or more receipts through providing all the identifications.
+
+<h3>Parameters</h3>
+
+* __orgId__ (string)
+One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+* __appId__ (string)
+One of the application&#39;s identification which includes name or uuid. (Specified in path).
+* __receiptId__ (string)
+One of the receipt&#39;s identification which includes name or uuid. (Specified in path).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of retrieved notification&#39;s info.
+* Schema: [Notification](#notification)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+### Organization Methods
+
+<h2 class="usergrid-POST-heading">POST /management/orgs</h2>
+
+Create an organization through a form post.
+
+<h3>Parameters</h3>
+
+* __CreateOrg__ ([CreateOrg](#createorg))
+A set of organization properties supplied through a form. (Specified in body).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of created Organization.
+* Schema: [Organization](#organization)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+
+<h2 class="usergrid-GET-heading">GET /management/orgs/{orgId}</h2>
+
+Retrieve an organization given a specified UUID or username.
+
+<h3>Parameters</h3>
+
+* __orgId__ (string)
+One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of created Organization.
+* Schema: [Organization](#organization)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+### Permission Methods
+
+<h2 class="usergrid-DELETE-heading">DELETE /{orgId}/{appId}/roles/{roleId}/permissions</h2>
+
+Remove permissions from a role. 
+
+<h3>Parameters</h3>
+
+* __orgId__ (string)
+One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+* __appId__ (string)
+One of the application&#39;s identification which includes name or uuid. (Specified in path).
+* __roleId__ (string)
+One of the role&#39;s identification which includes name or uuid. (Specified in path).
+* __grant_url_pattern__ ()
+The query statement of the url pattern. (Specified in query).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of deleted permission&#39;s info.
+* Schema: [Permission](#permission)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+### Receipt Methods
+
+<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/receipts</h2>
+
+Retrieve one or more receipts through providing all the identifications.
+
+<h3>Parameters</h3>
+
+* __orgId__ (string)
+One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+* __appId__ (string)
+One of the application&#39;s identification which includes name or uuid. (Specified in path).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of retrieved receipt&#39;s info.
+* Schema: [Receipt](#receipt)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+
+<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/{deviceId}/*/receipts</h2>
+
+Retrieve receipts associated with one or more devices through providing all the identifications.
+
+<h3>Parameters</h3>
+
+* __orgId__ (string)
+One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+* __appId__ (string)
+One of the application&#39;s identification which includes name or uuid. (Specified in path).
+* __deviceId__ (string)
+One of the device&#39;s identification which includes name or uuid. (Specified in path).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of retrieved receipt&#39;s info.
+* Schema: [Receipt](#receipt)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+
+<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/{notificationId}/*/receipts</h2>
+
+Retrieve receipts for one or more notifications through providing all the identifications.&quot;
+
+<h3>Parameters</h3>
+
+* __orgId__ (string)
+One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+* __appId__ (string)
+One of the application&#39;s identification which includes name or uuid. (Specified in path).
+* __notificationId__ (string)
+One of the notification&#39;s identification which includes name or uuid. (Specified in path).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of retrieved receipt&#39;s info.
+* Schema: [Receipt](#receipt)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+### Role Methods
+
+<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/roles</h2>
+
+Retrieve the roles in an application through providing all the identifications.
+
+<h3>Parameters</h3>
+
+* __orgId__ (string)
+One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+* __appId__ (string)
+One of the application&#39;s identification which includes name or uuid. (Specified in path).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of retrieved role&#39;s info.
+* Schema: [Role](#role)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+
+<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/roles</h2>
+
+Create a new role through providing all the identifications.
+
+<h3>Parameters</h3>
+
+* __orgId__ (string)
+One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+* __appId__ (string)
+One of the application&#39;s identification which includes name or uuid. (Specified in path).
+* __roleproperty__ ([AddRole](#addrole))
+The required properties of the role. (Specified in body).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of created role&#39;s info.
+* Schema: [Role](#role)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+
+<h2 class="usergrid-DELETE-heading">DELETE /{orgId}/{appId}/roles/{rolename}</h2>
+
+Remove a role through providing all the identifications.
+
+<h3>Parameters</h3>
+
+* __orgId__ (string)
+One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+* __appId__ (string)
+One of the application&#39;s identification which includes name or uuid. (Specified in path).
+* __rolename__ (string)
+The name of the role. (Specified in path).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of deleted role&#39;s info.
+* Schema: [Role](#role)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+### User Methods
+
+<h2 class="usergrid-GET-heading">GET /management/orgs/{orgId}/users</h2>
+
+Retrieve details about the admin users in an organization.
+
+<h3>Parameters</h3>
+
+* __orgId__ (string)
+One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of retrieved Admin user&#39;s info.
+* Schema: [User](#user)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+
+<h2 class="usergrid-DELETE-heading">DELETE /management/orgs/{orgId}/users/{userId}</h2>
+
+Remove an admin user from an organization through providing both Id of application and organization.
+
+<h3>Parameters</h3>
+
+* __orgId__ (string)
+One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+* __userId-2__ (string)
+One of the user&#39;s identification which includes username, email address or UUID. (Specified in path).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of deleted Admin user&#39;s info.
+* Schema: [User](#user)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+
+<h2 class="usergrid-POST-heading">POST /management/users</h2>
+
+Create a whole new admin user.
+
+<h3>Parameters</h3>
+
+* __adminuserproperty__ ([CreateAdminUser](#createadminuser))
+One or more sets of user properties of which username is mandatory and must be unique. (Specified in body).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of new created Admin user&#39;s info.
+* Schema: [User](#user)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+
+<h2 class="usergrid-GET-heading">GET /management/users/{userId}</h2>
+
+Retrieve details about an admin user.
+
+<h3>Parameters</h3>
+
+* __userId__ (string)
+One of the user&#39;s identification which includes username, real name, email address or UUID. (Specified in path).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of user&#39;s details
+* Schema: [User](#user)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+
+<h2 class="usergrid-PUT-heading">PUT /management/users/{userId}</h2>
+
+Update the info of an admin user.
+
+<h3>Parameters</h3>
+
+* __userId__ (string)
+One of the user&#39;s identification which includes username, real name, email address or UUID. (Specified in path).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of user&#39;s details.
+* Schema: [User](#user)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+
+<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/groups/{groupId}/users/{userId}</h2>
+
+Add a user to a group through providing all the identifications.
+
+<h3>Parameters</h3>
+
+* __orgId__ (string)
+One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+* __appId__ (string)
+One of the application&#39;s identification which includes name or uuid. (Specified in path).
+* __groupId__ (string)
+One of the group&#39;s identification which includes name or uuid. (Specified in path).
+* __userId-3__ (string)
+One of the user&#39;s identification which includes username or UUID. (Specified in path).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of added user&#39;s info.
+* Schema: [User](#user)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+
+<h2 class="usergrid-DELETE-heading">DELETE /{orgId}/{appId}/groups/{groupId}/users/{userId}</h2>
+
+Delete user from a group through providing all the identifications.
+
+<h3>Parameters</h3>
+
+* __orgId__ (string)
+One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+* __appId__ (string)
+One of the application&#39;s identification which includes name or uuid. (Specified in path).
+* __groupId__ (string)
+One of the group&#39;s identification which includes name or uuid. (Specified in path).
+* __userId-3__ (string)
+One of the user&#39;s identification which includes username or UUID. (Specified in path).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of deleted user&#39;s info.
+* Schema: [User](#user)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+
+<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/roles/{roleId}/users</h2>
+
+Retrieve the users in a role through providing all the identifications.
+
+<h3>Parameters</h3>
+
+* __orgId__ (string)
+One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+* __appId__ (string)
+One of the application&#39;s identification which includes name or uuid. (Specified in path).
+* __roleId__ (string)
+One of the role&#39;s identification which includes name or uuid. (Specified in path).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of retrieved user&#39;s info.
+* Schema: [User](#user)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+
+<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/roles/{roleId}/users/{userId}</h2>
+
+Add a user to a role through providing all the identifications.
+
+<h3>Parameters</h3>
+
+* __orgId__ (string)
+One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+* __appId__ (string)
+One of the application&#39;s identification which includes name or uuid. (Specified in path).
+* __roleId__ (string)
+One of the role&#39;s identification which includes name or uuid. (Specified in path).
+* __userId-3__ (string)
+One of the user&#39;s identification which includes username or UUID. (Specified in path).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of added user&#39;s info.
+* Schema: [User](#user)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+
+<h2 class="usergrid-DELETE-heading">DELETE /{orgId}/{appId}/roles/{roleId}/users/{userId}</h2>
+
+Remove a user from a role through providing all the identifications.
+
+<h3>Parameters</h3>
+
+* __orgId__ (string)
+One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+* __appId__ (string)
+One of the application&#39;s identification which includes name or uuid. (Specified in path).
+* __roleId__ (string)
+One of the role&#39;s identification which includes name or uuid. (Specified in path).
+* __userId-3__ (string)
+One of the user&#39;s identification which includes username or UUID. (Specified in path).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of deleted user&#39;s info.
+* Schema: [User](#user)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+
+<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/users</h2>
+
+Retrieve users though query statement.
+
+<h3>Parameters</h3>
+
+* __orgId__ (string)
+One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+* __appId__ (string)
+One of the application&#39;s identification which includes name or uuid. (Specified in path).
+* __queryStatement__ ()
+The query statement of the User. (Specified in query).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of retrieved user&#39;s info.
+* Schema: [User](#user)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+
+<h2 class="usergrid-POST-heading">POST /{orgId}/{appId}/users</h2>
+
+Create a user in the users collection through providing all the identifications.
+
+<h3>Parameters</h3>
+
+* __orgId__ (string)
+One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+* __appId__ (string)
+One of the application&#39;s identification which includes name or uuid. (Specified in path).
+* __CreateUser__ ([CreateUser](#createuser))
+The properties of the user. (Specified in body).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of created user&#39;s info.
+* Schema: [User](#user)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+
+<h2 class="usergrid-GET-heading">GET /{orgId}/{appId}/users/{userId}</h2>
+
+Retrieve a user through providing all the identifications.
+
+<h3>Parameters</h3>
+
+* __orgId__ (string)
+One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+* __appId__ (string)
+One of the application&#39;s identification which includes name or uuid. (Specified in path).
+* __userId-2__ (string)
+One of the user&#39;s identification which includes username, email address or UUID. (Specified in path).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of retrieved user&#39;s info.
+* Schema: [User](#user)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+
+<h2 class="usergrid-PUT-heading">PUT /{orgId}/{appId}/users/{userId}</h2>
+
+Update a user through providing all the identifications.
+
+<h3>Parameters</h3>
+
+* __orgId__ (string)
+One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+* __appId__ (string)
+One of the application&#39;s identification which includes name or uuid. (Specified in path).
+* __userId-3__ (string)
+One of the user&#39;s identification which includes username or UUID. (Specified in path).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of updated user&#39;s info.
+* Schema: [User](#user)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+
+<h2 class="usergrid-DELETE-heading">DELETE /{orgId}/{appId}/users/{userId}</h2>
+
+Remove a user through providing all the identifications.
+
+<h3>Parameters</h3>
+
+* __orgId__ (string)
+One of the organization&#39;s identification which includes name or uuid. (Specified in path).
+* __appId__ (string)
+One of the application&#39;s identification which includes name or uuid. (Specified in path).
+* __userId-3__ (string)
+One of the user&#39;s identification which includes username or UUID. (Specified in path).
+
+<h3>Responses</h3>
+
+__200__
+
+* Description: An array of deleted user&#39;s info.
+* Schema: [User](#user)
+    
+__default__
+
+* Description: Unexpected error.
+* Schema: [Error](#error)
+    
+
+## Models
+Properties for Usergrid default entities.
+
+### Action
+
+__Properties__ 
+
+<table width="80%" class="usergrid-table">
+    <tr>
+        <th>Name</th>
+        <th>Type</th>
+        <th>Description</th>
+        <th>Required</th>
+    </tr>
+    <tr>
+        <td>action</td>
+        <td>string</td>
+        <td>The requested action.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>status</td>
+        <td>string</td>
+        <td>The status of the requested action.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>token</td>
+        <td>string</td>
+        <td>The token required for getting an AdminUser.</td>
+        <td>false</td>
+    </tr>
+</table>
+
+### ActivityFeed
+
+__Properties__ 
+
+<table width="80%" class="usergrid-table">
+    <tr>
+        <th>Name</th>
+        <th>Type</th>
+        <th>Description</th>
+        <th>Required</th>
+    </tr>
+    <tr>
+        <td>entityproperty</td>
+        <td>ref</td>
+        <td></td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>category</td>
+        <td>string</td>
+        <td>The category of the activity.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>metadataproperty</td>
+        <td>ref</td>
+        <td></td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>objectproperty</td>
+        <td>ref</td>
+        <td></td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>title</td>
+        <td>string</td>
+        <td>The title of the activity.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>verb</td>
+        <td>string</td>
+        <td>The verb of the activity.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>completeMsg</td>
+        <td>ref</td>
+        <td></td>
+        <td>false</td>
+    </tr>
+</table>
+
+### Actor
+
+__Properties__ 
+
+<table width="80%" class="usergrid-table">
+    <tr>
+        <th>Name</th>
+        <th>Type</th>
+        <th>Description</th>
+        <th>Required</th>
+    </tr>
+    <tr>
+        <td>displayname</td>
+        <td>string</td>
+        <td>The display of the name of the actor.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>objecttype</td>
+        <td>string</td>
+        <td>The type of the actor.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>objectuuId</td>
+        <td>string</td>
+        <td>The UUID of the actor.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>entitytype</td>
+        <td>string</td>
+        <td>The entitytype of the actor.</td>
+        <td>false</td>
+    </tr>
+</table>
+
+### AddPermission
+
+__Properties__ 
+
+<table width="80%" class="usergrid-table">
+    <tr>
+        <th>Name</th>
+        <th>Type</th>
+        <th>Description</th>
+        <th>Required</th>
+    </tr>
+    <tr>
+        <td>operation</td>
+        <td>string</td>
+        <td>A comma-delimited set of HTTP methods (GET, PUT, POST, DELETE) that are allowed for the specified resource path.</td>
+        <td>true</td>
+    </tr>
+    <tr>
+        <td>resource_path</td>
+        <td>string</td>
+        <td>The path to the resources to be accessed.</td>
+        <td>true</td>
+    </tr>
+</table>
+
+### AddRole
+
+__Properties__ 
+
+<table width="80%" class="usergrid-table">
+    <tr>
+        <th>Name</th>
+        <th>Type</th>
+        <th>Description</th>
+        <th>Required</th>
+    </tr>
+    <tr>
+        <td>title</td>
+        <td>string</td>
+        <td>The title of the role.</td>
+        <td>true</td>
+    </tr>
+    <tr>
+        <td>role name</td>
+        <td>string</td>
+        <td>The name of the role.</td>
+        <td>true</td>
+    </tr>
+</table>
+
+### AdminUserUpdate
+
+__Properties__ 
+
+<table width="80%" class="usergrid-table">
+    <tr>
+        <th>Name</th>
+        <th>Type</th>
+        <th>Description</th>
+        <th>Required</th>
+    </tr>
+    <tr>
+        <td>city</td>
+        <td>string</td>
+        <td></td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>state</td>
+        <td>string</td>
+        <td></td>
+        <td>false</td>
+    </tr>
+</table>
+
+### AppData
+
+__Properties__ 
+
+<table width="80%" class="usergrid-table">
+    <tr>
+        <th>Name</th>
+        <th>Type</th>
+        <th>Description</th>
+        <th>Required</th>
+    </tr>
+    <tr>
+        <td>tester/sandbox</td>
+        <td>string</td>
+        <td>The UUID of tester/sandbox.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>tester/app1</td>
+        <td>string</td>
+        <td>The UUID of tester/app1.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>tester/app2</td>
+        <td>string</td>
+        <td>The UUID of tester/app2.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>completeMsg</td>
+        <td>ref</td>
+        <td></td>
+        <td>false</td>
+    </tr>
+</table>
+
+### CancelMSG
+
+__Properties__ 
+
+<table width="80%" class="usergrid-table">
+    <tr>
+        <th>Name</th>
+        <th>Type</th>
+        <th>Description</th>
+        <th>Required</th>
+    </tr>
+    <tr>
+        <td>canceled</td>
+        <td>boolean</td>
+        <td></td>
+        <td>true</td>
+    </tr>
+</table>
+
+### Collections
+
+__Properties__ 
+
+<table width="80%" class="usergrid-table">
+    <tr>
+        <th>Name</th>
+        <th>Type</th>
+        <th>Description</th>
+        <th>Required</th>
+    </tr>
+    <tr>
+        <td>activities</td>
+        <td>string</td>
+        <td></td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>feed</td>
+        <td>string</td>
+        <td></td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>roles</td>
+        <td>string</td>
+        <td></td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>users</td>
+        <td>string</td>
+        <td></td>
+        <td>false</td>
+    </tr>
+</table>
+
+### CreateActivity
+
+__Properties__ 
+
+<table width="80%" class="usergrid-table">
+    <tr>
+        <th>Name</th>
+        <th>Type</th>
+        <th>Description</th>
+        <th>Required</th>
+    </tr>
+    <tr>
+        <td>displayName</td>
+        <td>string</td>
+        <td></td>
+        <td>true</td>
+    </tr>
+    <tr>
+        <td>uuid</td>
+        <td>string</td>
+        <td></td>
+        <td>true</td>
+    </tr>
+    <tr>
+        <td>username</td>
+        <td>string</td>
+        <td></td>
+        <td>true</td>
+    </tr>
+    <tr>
+        <td>image</td>
+        <td>ref</td>
+        <td></td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>verb</td>
+        <td>string</td>
+        <td></td>
+        <td>true</td>
+    </tr>
+    <tr>
+        <td>content</td>
+        <td>string</td>
+        <td></td>
+        <td>true</td>
+    </tr>
+</table>
+
+### CreateAdminUser
+
+__Properties__ 
+
+<table width="80%" class="usergrid-table">
+    <tr>
+        <th>Name</th>
+        <th>Type</th>
+        <th>Description</th>
+        <th>Required</th>
+    </tr>
+    <tr>
+        <td>username</td>
+        <td>string</td>
+        <td></td>
+        <td>true</td>
+    </tr>
+    <tr>
+        <td>email</td>
+        <td>string</td>
+        <td></td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>name</td>
+        <td>string</td>
+        <td></td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>password</td>
+        <td>string</td>
+        <td></td>
+        <td>false</td>
+    </tr>
+</table>
+
+### CreateApp
+
+__Properties__ 
+
+<table width="80%" class="usergrid-table">
+    <tr>
+        <th>Name</th>
+        <th>Type</th>
+        <th>Description</th>
+        <th>Required</th>
+    </tr>
+    <tr>
+        <td>token</td>
+        <td>string</td>
+        <td>The OAuth2 access token.</td>
+        <td>true</td>
+    </tr>
+    <tr>
+        <td>name</td>
+        <td>string</td>
+        <td>The name of the application.</td>
+        <td>true</td>
+    </tr>
+</table>
+
+### CreateEntities
+
+__Properties__ 
+
+<table width="80%" class="usergrid-table">
+    <tr>
+        <th>Name</th>
+        <th>Type</th>
+        <th>Description</th>
+        <th>Required</th>
+    </tr>
+</table>
+
+### CreateEntity
+
+__Properties__ 
+
+<table width="80%" class="usergrid-table">
+    <tr>
+        <th>Name</th>
+        <th>Type</th>
+        <th>Description</th>
+        <th>Required</th>
+    </tr>
+    <tr>
+        <td>property</td>
+        <td>string</td>
+        <td>The property of the entity.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>value</td>
+        <td>string</td>
+        <td>The relevant value of the property.</td>
+        <td>false</td>
+    </tr>
+</table>
+
+### CreateEvent
+
+__Properties__ 
+
+<table width="80%" class="usergrid-table">
+    <tr>
+        <th>Name</th>
+        <th>Type</th>
+        <th>Description</th>
+        <th>Required</th>
+    </tr>
+    <tr>
+        <td>timestamp</td>
+        <td>string</td>
+        <td></td>
+        <td>true</td>
+    </tr>
+</table>
+
+### CreateGroup
+
+__Properties__ 
+
+<table width="80%" class="usergrid-table">
+    <tr>
+        <th>Name</th>
+        <th>Type</th>
+        <th>Description</th>
+        <th>Required</th>
+    </tr>
+    <tr>
+        <td>title</td>
+        <td>string</td>
+        <td>The title of the group.</td>
+        <td>true</td>
+    </tr>
+    <tr>
+        <td>path</td>
+        <td>string</td>
+        <td>The path of the group.</td>
+        <td>true</td>
+    </tr>
+</table>
+
+### CreateNotification
+
+__Properties__ 
+
+<table width="80%" class="usergrid-table">
+    <tr>
+        <th>Name</th>
+        <th>Type</th>
+        <th>Description</th>
+        <th>Required</th>
+    </tr>
+    <tr>
+        <td>notifier</td>
+        <td>ref</td>
+        <td></td>
+        <td>true</td>
+    </tr>
+    <tr>
+        <td>message</td>
+        <td>string</td>
+        <td>The push notitfication message that will be delivered to the user.</td>
+        <td>true</td>
+    </tr>
+</table>
+
+### CreateNotifications
+
+__Properties__ 
+
+<table width="80%" class="usergrid-table">
+    <tr>
+        <th>Name</th>
+        <th>Type</th>
+        <th>Description</th>
+        <th>Required</th>
+    </tr>
+</table>
+
+### CreateOrg
+
+__Properties__ 
+
+<table width="80%" class="usergrid-table">
+    <tr>
+        <th>Name</th>
+        <th>Type</th>
+        <th>Description</th>
+        <th>Required</th>
+    </tr>
+    <tr>
+        <td>organization</td>
+        <td>string</td>
+        <td></td>
+        <td>true</td>
+    </tr>
+    <tr>
+        <td>username</td>
+        <td>string</td>
+        <td></td>
+        <td>true</td>
+    </tr>
+    <tr>
+        <td>name</td>
+        <td>string</td>
+        <td></td>
+        <td>true</td>
+    </tr>
+    <tr>
+        <td>email</td>
+        <td>string</td>
+        <td></td>
+        <td>true</td>
+    </tr>
+    <tr>
+        <td>password</td>
+        <td>string</td>
+        <td></td>
+        <td>true</td>
+    </tr>
+</table>
+
+### CreateUser
+
+__Properties__ 
+
+<table width="80%" class="usergrid-table">
+    <tr>
+        <th>Name</th>
+        <th>Type</th>
+        <th>Description</th>
+        <th>Required</th>
+    </tr>
+    <tr>
+        <td>username</td>
+        <td>string</td>
+        <td></td>
+        <td>true</td>
+    </tr>
+</table>
+
+### Credential
+
+__Properties__ 
+
+<table width="80%" class="usergrid-table">
+    <tr>
+        <th>Name</th>
+        <th>Type</th>
+        <th>Description</th>
+        <th>Required</th>
+    </tr>
+    <tr>
+        <td>client_Id</td>
+        <td>string</td>
+        <td>The Id of the client.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>client_secret</td>
+        <td>string</td>
+        <td>The secret of the client.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>completeMsg</td>
+        <td>ref</td>
+        <td></td>
+        <td>false</td>
+    </tr>
+</table>
+
+### Device
+
+__Properties__ 
+
+<table width="80%" class="usergrid-table">
+    <tr>
+        <th>Name</th>
+        <th>Type</th>
+        <th>Description</th>
+        <th>Required</th>
+    </tr>
+    <tr>
+        <td>uuid</td>
+        <td>string</td>
+        <td>Unique entity Id.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>type</td>
+        <td>string</td>
+        <td>Type of entity.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>name</td>
+        <td>string</td>
+        <td>Notifier display name.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>metadata</td>
+        <td>ref</td>
+        <td></td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>completeMsg</td>
+        <td>ref</td>
+        <td></td>
+        <td>false</td>
+    </tr>
+</table>
+
+### Entity
+
+__Properties__ 
+
+<table width="80%" class="usergrid-table">
+    <tr>
+        <th>Name</th>
+        <th>Type</th>
+        <th>Description</th>
+        <th>Required</th>
+    </tr>
+    <tr>
+        <td>uuid</td>
+        <td>string</td>
+        <td>The UUID of the entity.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>type</td>
+        <td>string</td>
+        <td>The type of the entity.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>actorproperty</td>
+        <td>ref</td>
+        <td></td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>metadata</td>
+        <td>ref</td>
+        <td></td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>name</td>
+        <td>string</td>
+        <td>The name of the entity.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>message</td>
+        <td>string</td>
+        <td></td>
+        <td>false</td>
+    </tr>
+</table>
+
+### Error
+
+__Properties__ 
+
+<table width="80%" class="usergrid-table">
+    <tr>
+        <th>Name</th>
+        <th>Type</th>
+        <th>Description</th>
+        <th>Required</th>
+    </tr>
+    <tr>
+        <td>code</td>
+        <td>integer</td>
+        <td></td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>message</td>
+        <td>string</td>
+        <td></td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>fields</td>
+        <td>object</td>
+        <td></td>
+        <td>false</td>
+    </tr>
+</table>
+
+### Event
+
+__Properties__ 
+
+<table width="80%" class="usergrid-table">
+    <tr>
+        <th>Name</th>
+        <th>Type</th>
+        <th>Description</th>
+        <th>Required</th>
+    </tr>
+    <tr>
+        <td>applicationName</td>
+        <td>string</td>
+        <td>The application name of the event.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>entity</td>
+        <td>ref</td>
+        <td></td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>url</td>
+        <td>string</td>
+        <td>The url of the event.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>applicationId</td>
+        <td>string</td>
+        <td>The application UUID of the event.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>parameters</td>
+        <td>string</td>
+        <td>The parameters of the event.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>organization</td>
+        <td>string</td>
+        <td>The title of the organization.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>completeMsg</td>
+        <td>ref</td>
+        <td></td>
+        <td>false</td>
+    </tr>
+</table>
+
+### Group
+
+__Properties__ 
+
+<table width="80%" class="usergrid-table">
+    <tr>
+        <th>Name</th>
+        <th>Type</th>
+        <th>Description</th>
+        <th>Required</th>
+    </tr>
+    <tr>
+        <td>uuid</td>
+        <td>string</td>
+        <td>The UUID of the group.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>type</td>
+        <td>string</td>
+        <td>The type of the group.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>created</td>
+        <td>string</td>
+        <td>The created Id for the group.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>modified</td>
+        <td>string</td>
+        <td>The modified Id for the group.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>path</td>
+        <td>string</td>
+        <td>The path of the group.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>metadata</td>
+        <td>ref</td>
+        <td></td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>title</td>
+        <td>string</td>
+        <td>The title of the group.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>completeMsg</td>
+        <td>ref</td>
+        <td></td>
+        <td>false</td>
+    </tr>
+</table>
+
+### ImageModel
+
+__Properties__ 
+
+<table width="80%" class="usergrid-table">
+    <tr>
+        <th>Name</th>
+        <th>Type</th>
+        <th>Description</th>
+        <th>Required</th>
+    </tr>
+    <tr>
+        <td>url</td>
+        <td>string</td>
+        <td></td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>wIdth</td>
+        <td>integer</td>
+        <td></td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>email</td>
+        <td>string</td>
+        <td></td>
+        <td>false</td>
+    </tr>
+</table>
+
+### Metadata
+
+__Properties__ 
+
+<table width="80%" class="usergrid-table">
+    <tr>
+        <th>Name</th>
+        <th>Type</th>
+        <th>Description</th>
+        <th>Required</th>
+    </tr>
+    <tr>
+        <td>cursor</td>
+        <td>string</td>
+        <td>The cursor of the metadata.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>path</td>
+        <td>string</td>
+        <td>The path of the metadata.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>sets</td>
+        <td>ref</td>
+        <td></td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>collections</td>
+        <td>ref</td>
+        <td></td>
+        <td>false</td>
+    </tr>
+</table>
+
+### Notification
+
+__Properties__ 
+
+<table width="80%" class="usergrid-table">
+    <tr>
+        <th>Name</th>
+        <th>Type</th>
+        <th>Description</th>
+        <th>Required</th>
+    </tr>
+    <tr>
+        <td>uuid</td>
+        <td>string</td>
+        <td>Unique entity Id.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>type</td>
+        <td>string</td>
+        <td>Type of entity.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>payloads</td>
+        <td>string</td>
+        <td>The push notifications to be delivered.</td>
+        <td>true</td>
+    </tr>
+    <tr>
+        <td>errorMessage</td>
+        <td>string</td>
+        <td>Error message returned by the notification service (APNs or GCM) if the notification fails entirely.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>scheduled</td>
+        <td>boolean</td>
+        <td>whether the notification is currently scheduled for delivery.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>state</td>
+        <td>string</td>
+        <td>The current delivery status of the notification &#39;FINISHED&#39;, &#39;SCHEDULED&#39; or &#39;CANCELED&#39;.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>metadata</td>
+        <td>ref</td>
+        <td></td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>completeMsg</td>
+        <td>ref</td>
+        <td></td>
+        <td>false</td>
+    </tr>
+</table>
+
+### Notifier
+
+__Properties__ 
+
+<table width="80%" class="usergrid-table">
+    <tr>
+        <th>Name</th>
+        <th>Type</th>
+        <th>Description</th>
+        <th>Required</th>
+    </tr>
+    <tr>
+        <td>uuid</td>
+        <td>string</td>
+        <td>Unique entity Id.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>type</td>
+        <td>string</td>
+        <td>Type of entity.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>name</td>
+        <td>string</td>
+        <td>Notifier display name.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>provider</td>
+        <td>string</td>
+        <td>Push notification provider &#39;apple&#39; or &#39;google&#39;.</td>
+        <td>true</td>
+    </tr>
+    <tr>
+        <td>environment</td>
+        <td>string</td>
+        <td>The environment that corresponds to your app &#39;development&#39; or &#39;production&#39;.</td>
+        <td>true</td>
+    </tr>
+    <tr>
+        <td>metadata</td>
+        <td>ref</td>
+        <td></td>
+        <td>false</td>
+    </tr>
+</table>
+
+### Object
+
+__Properties__ 
+
+<table width="80%" class="usergrid-table">
+    <tr>
+        <th>Name</th>
+        <th>Type</th>
+        <th>Description</th>
+        <th>Required</th>
+    </tr>
+    <tr>
+        <td>displayname</td>
+        <td>string</td>
+        <td>The display of the name of the object.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>objecttype</td>
+        <td>string</td>
+        <td>The type of the object.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>objectuuId</td>
+        <td>string</td>
+        <td>The UUID of the object.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>entitytype</td>
+        <td>string</td>
+        <td>The entitytype of the object.</td>
+        <td>false</td>
+    </tr>
+</table>
+
+### Organization
+
+__Properties__ 
+
+<table width="80%" class="usergrid-table">
+    <tr>
+        <th>Name</th>
+        <th>Type</th>
+        <th>Description</th>
+        <th>Required</th>
+    </tr>
+    <tr>
+        <td>applicationId</td>
+        <td>string</td>
+        <td>The application Id of the owner.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>username</td>
+        <td>string</td>
+        <td>The username of the owner.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>name</td>
+        <td>string</td>
+        <td>The name of the owner.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>email</td>
+        <td>string</td>
+        <td>The email of the owner.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>activated</td>
+        <td>boolean</td>
+        <td>Indicate whether the account is activated or not.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>disabled</td>
+        <td>boolean</td>
+        <td>Indicate whether the account is disabled or not.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>uuid</td>
+        <td>string</td>
+        <td>The UUID of the owner.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>adminUser</td>
+        <td>boolean</td>
+        <td>Indicate whether the use is a adminUser or not.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>displayEmail</td>
+        <td>string</td>
+        <td>The display of the email of the owner.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>htmldisplayEmail</td>
+        <td>string</td>
+        <td>The HTML display of the email of the owner.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>orgname</td>
+        <td>string</td>
+        <td>The name of the organization.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>orguuId</td>
+        <td>string</td>
+        <td>The UUID of the organization.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>applicationdata</td>
+        <td>ref</td>
+        <td></td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>completeMsg</td>
+        <td>ref</td>
+        <td></td>
+        <td>false</td>
+    </tr>
+</table>
+
+### Permission
+
+__Properties__ 
+
+<table width="80%" class="usergrid-table">
+    <tr>
+        <th>Name</th>
+        <th>Type</th>
+        <th>Description</th>
+        <th>Required</th>
+    </tr>
+    <tr>
+        <td>applicationName</td>
+        <td>string</td>
+        <td>The name of the application of the permission.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>entity</td>
+        <td>ref</td>
+        <td></td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>url</td>
+        <td>string</td>
+        <td>The url of the permission.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>applicationId</td>
+        <td>string</td>
+        <td>The UUID of the application.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>parameters</td>
+        <td>string</td>
+        <td>The parameters of the permission.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>organization</td>
+        <td>string</td>
+        <td>The organization of the permission.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>permissiondata</td>
+        <td>ref</td>
+        <td></td>
+        <td>false</td>
+    </tr>
+</table>
+
+### Receipt
+
+__Properties__ 
+
+<table width="80%" class="usergrid-table">
+    <tr>
+        <th>Name</th>
+        <th>Type</th>
+        <th>Description</th>
+        <th>Required</th>
+    </tr>
+    <tr>
+        <td>uuid</td>
+        <td>string</td>
+        <td>Unique entity Id.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>type</td>
+        <td>string</td>
+        <td>Type of entity.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>payloads</td>
+        <td>string</td>
+        <td>The push notifications to be delivered.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>errorMessage</td>
+        <td>string</td>
+        <td>Error message returned by the notification service (APNs or GCM) if the notification fails entirely.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>errorCode</td>
+        <td>string</td>
+        <td>Error code returned by the notification service.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>sent</td>
+        <td>number</td>
+        <td>UTC timestamp in milliseconds for when the notification was sent.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>metadata</td>
+        <td>ref</td>
+        <td></td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>completeMsg</td>
+        <td>ref</td>
+        <td></td>
+        <td>false</td>
+    </tr>
+</table>
+
+### ResetPW
+
+__Properties__ 
+
+<table width="80%" class="usergrid-table">
+    <tr>
+        <th>Name</th>
+        <th>Type</th>
+        <th>Description</th>
+        <th>Required</th>
+    </tr>
+    <tr>
+        <td>password</td>
+        <td>string</td>
+        <td></td>
+        <td>true</td>
+    </tr>
+    <tr>
+        <td>newpassword</td>
+        <td>string</td>
+        <td></td>
+        <td>true</td>
+    </tr>
+</table>
+
+### ResetPWMsg
+
+__Properties__ 
+
+<table width="80%" class="usergrid-table">
+    <tr>
+        <th>Name</th>
+        <th>Type</th>
+        <th>Description</th>
+        <th>Required</th>
+    </tr>
+    <tr>
+        <td>recaptcha_response</td>
+        <td>string</td>
+        <td>Parameters and value for the Captcha challenge.</td>
+        <td>true</td>
+    </tr>
+    <tr>
+        <td>recaptcha_challenge</td>
+        <td>string</td>
+        <td>The admin user&#39;s response to the Captcha challenge.</td>
+        <td>true</td>
+    </tr>
+    <tr>
+        <td>email</td>
+        <td>string</td>
+        <td></td>
+        <td>true</td>
+    </tr>
+</table>
+
+### Role
+
+__Properties__ 
+
+<table width="80%" class="usergrid-table">
+    <tr>
+        <th>Name</th>
+        <th>Type</th>
+        <th>Description</th>
+        <th>Required</th>
+    </tr>
+    <tr>
+        <td>applicationName</td>
+        <td>string</td>
+        <td>The application name of the event.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>entity</td>
+        <td>ref</td>
+        <td></td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>url</td>
+        <td>string</td>
+        <td>The url of the event.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>applicationId</td>
+        <td>string</td>
+        <td>The application UUID of the event.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>parameters</td>
+        <td>string</td>
+        <td>The parameters of the event.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>organization</td>
+        <td>string</td>
+        <td>The title of the organization.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>completeMsg</td>
+        <td>ref</td>
+        <td></td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>path</td>
+        <td>string</td>
+        <td>The path of the role.</td>
+        <td>false</td>
+    </tr>
+</table>
+
+### ScheduleNotification
+
+__Properties__ 
+
+<table width="80%" class="usergrid-table">
+    <tr>
+        <th>Name</th>
+        <th>Type</th>
+        <th>Description</th>
+        <th>Required</th>
+    </tr>
+    <tr>
+        <td>timestamp</td>
+        <td>string</td>
+        <td>UTC timestamp in milliseconds of when schedule notifications.</td>
+        <td>true</td>
+    </tr>
+</table>
+
+### SetExpiration
+
+__Properties__ 
+
+<table width="80%" class="usergrid-table">
+    <tr>
+        <th>Name</th>
+        <th>Type</th>
+        <th>Description</th>
+        <th>Required</th>
+    </tr>
+    <tr>
+        <td>timestamp</td>
+        <td>string</td>
+        <td>UTC timestamp in milliseconds of when set expirations.</td>
+        <td>true</td>
+    </tr>
+</table>
+
+### Sets
+
+__Properties__ 
+
+<table width="80%" class="usergrid-table">
+    <tr>
+        <th>Name</th>
+        <th>Type</th>
+        <th>Description</th>
+        <th>Required</th>
+    </tr>
+    <tr>
+        <td>rolenames</td>
+        <td>string</td>
+        <td></td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>permissions</td>
+        <td>string</td>
+        <td></td>
+        <td>false</td>
+    </tr>
+</table>
+
+### User
+
+__Properties__ 
+
+<table width="80%" class="usergrid-table">
+    <tr>
+        <th>Name</th>
+        <th>Type</th>
+        <th>Description</th>
+        <th>Required</th>
+    </tr>
+    <tr>
+        <td>applicationId</td>
+        <td>string</td>
+        <td>The application Id of a user.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>username</td>
+        <td>string</td>
+        <td>The username of a user.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>name</td>
+        <td>string</td>
+        <td>The name of a user.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>email</td>
+        <td>string</td>
+        <td>The email of a user.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>activated</td>
+        <td>boolean</td>
+        <td>Indicate whether the account is activated or not.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>disabled</td>
+        <td>boolean</td>
+        <td>Indicate whether the account is disabled or not.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>uuid</td>
+        <td>string</td>
+        <td>The UUID of a user.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>adminUser</td>
+        <td>boolean</td>
+        <td>Indicate whether the use is a adminUser or not.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>displayEmail</td>
+        <td>string</td>
+        <td>The display of the email of a user.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>htmldisplayEmail</td>
+        <td>string</td>
+        <td>The HTML display of the email of a user.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>organization</td>
+        <td>string</td>
+        <td>The organization of the user.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>picture</td>
+        <td>string</td>
+        <td>The uri of the user&#39;s picture.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>uri</td>
+        <td>string</td>
+        <td>The uri of the user.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>path</td>
+        <td>string</td>
+        <td>The path of the user.</td>
+        <td>false</td>
+    </tr>
+    <tr>
+        <td>completeMsg</td>
+        <td>ref</td>
+        <td></td>
+        <td>false</td>
+    </tr>
+</table>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/sdks/ios.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/sdks/ios.txt b/content/docs/_sources/sdks/ios.txt
new file mode 100644
index 0000000..328b09a
--- /dev/null
+++ b/content/docs/_sources/sdks/ios.txt
@@ -0,0 +1 @@
+# iOS SDK
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/sdks/java.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/sdks/java.txt b/content/docs/_sources/sdks/java.txt
new file mode 100644
index 0000000..a2a5086
--- /dev/null
+++ b/content/docs/_sources/sdks/java.txt
@@ -0,0 +1 @@
+# Java SDK
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/sdks/javascript.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/sdks/javascript.txt b/content/docs/_sources/sdks/javascript.txt
new file mode 100644
index 0000000..685d42d
--- /dev/null
+++ b/content/docs/_sources/sdks/javascript.txt
@@ -0,0 +1,3 @@
+# JavaScript/HTML5 SDK
+
+

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/sdks/tbd.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/sdks/tbd.txt b/content/docs/_sources/sdks/tbd.txt
new file mode 100644
index 0000000..279d128
--- /dev/null
+++ b/content/docs/_sources/sdks/tbd.txt
@@ -0,0 +1 @@
+# COMING SOON...
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/sdks/usage.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/sdks/usage.txt b/content/docs/_sources/sdks/usage.txt
new file mode 100644
index 0000000..2d2f139
--- /dev/null
+++ b/content/docs/_sources/sdks/usage.txt
@@ -0,0 +1,16 @@
+# SDKs & Tools
+
+## SDKs
+
+* [iOS SDK](https://github.com/apache/incubator-usergrid/tree/master/sdks/ios)
+* [Android SDK](https://github.com/apache/incubator-usergrid/tree/master/sdks/android)
+* [HTML5 / JavaScript SDK](https://github.com/apache/incubator-usergrid/tree/master/sdks/html5-javascript)
+* [Windows 8 / Windows Phone / .net SDK](https://github.com/apache/incubator-usergrid/tree/master/sdks/dotnet)
+* [Ruby gem](https://github.com/apache/incubator-usergrid/tree/master/sdks/ruby)
+* [Ruby on Rails gem](https://github.com/apache/incubator-usergrid/tree/master/sdks/ruby-on-rails)
+* [PHP library](https://github.com/apache/incubator-usergrid/tree/master/sdks/php)
+* [Java library](https://github.com/apache/incubator-usergrid/tree/master/sdks/java)
+* [Perl module](https://github.com/apache/incubator-usergrid/tree/master/sdks/perl)
+
+## Tools
+[ugc — the Command-line Client](https://github.com/apache/incubator-usergrid/tree/master/ugc#usergrid-command-line-ugc)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4a92ab09/content/docs/_sources/security-and-auth/app-security.txt
----------------------------------------------------------------------
diff --git a/content/docs/_sources/security-and-auth/app-security.txt b/content/docs/_sources/security-and-auth/app-security.txt
new file mode 100644
index 0000000..9dcf3e2
--- /dev/null
+++ b/content/docs/_sources/security-and-auth/app-security.txt
@@ -0,0 +1,19 @@
+# Security & token authentication
+
+Any app you put into production should feature security that protects your app, your users, and your app's data. Implementing security means taking steps in your mobile app's code and in your API Services BaaS application.
+
+__Important__: When you register for the API Services BaaS, you get a sandbox application that you can use to try things out. This application is not for use in production. By default, the sandbox application is not protected by any security measures whatsoever. Use the sandbox only for experimentation, and only with data that isn't in any way sensitive.
+
+When securing your app, follow these high-level steps:
+
+1. Define the rules that will govern access by your app's users to your app's data and features. You do this with the admin portal by creating permission rules, then associating those rules with your users. For more information, see [Using Permissions](managing-access-defining-permission-rules.html).
+2. Write code through which your app's users can verify who they are to your application. You do this by writing code that uses their username and password as credentials to initially authenticate with your application, then uses a token thereafter. (This authentication style supports the OAuth 2.0 model.) For more information, see [Authenticating users & app clients](autheticating-users-and-application-clients.html).
+3. Be sure to use coding best practices that help ensure that your app is protected from malicious attacks. For more information, see [Security best practices](security-best-practices.html).
+
+The following illustration describes these high-level areas.
+
+.. image:: securitymodel0.png
+
+
+
+

[46/60] [abbrv] incubator-usergrid git commit: Clean up unused files.

[sn...@apache.org]

Clean up unused files.

(cherry picked from commit cca8a9479d4a3273fe2b6e2f0f49965377d22aba)


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/d658f63d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/d658f63d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/d658f63d

Branch: refs/heads/two-dot-o-dev
Commit: d658f63da0ae85de823000411c29eaf965d27c9e
Parents: c4116fa
Author: Dave Johnson <sn...@apache.org>
Authored: Thu Aug 6 11:36:50 2015 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Wed Aug 12 13:02:45 2015 -0400

----------------------------------------------------------------------
 docs/asset-and-files/assets.md           |  20 --
 docs/data-queries/query-language.md      | 427 --------------------------
 docs/entity-connections/relationships.md |  98 ------
 docs/geolocation/tbd.md                  |   1 -
 4 files changed, 546 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d658f63d/docs/asset-and-files/assets.md
----------------------------------------------------------------------
diff --git a/docs/asset-and-files/assets.md b/docs/asset-and-files/assets.md
deleted file mode 100644
index ea7291c..0000000
--- a/docs/asset-and-files/assets.md
+++ /dev/null
@@ -1,20 +0,0 @@
-# Assets
-
-Asset entities are used primarily in Apache Usergrid to manage binary data
-objects such as images, video, and audio content. However, an asset does
-not have to be used for a binary object. For example, assets can be used
-to model a file system.
-
-
-  Property       Type     Description
-  -------------- -------- ---------------------------------------------------------------------------------
-  uuid           UUID     Asset’s unique entity ID
-  type           string   "asset"
-  name           string   Asset name (mandatory)
-  created        long     [UNIX timestamp](http://en.wikipedia.org/wiki/Unix_time) of entity creation
-  modified       long     [UNIX timestamp](http://en.wikipedia.org/wiki/Unix_time) of entity modification
-  owner          UUID     UUID of the asset’s owner (mandatory)
-  path           string   Relative path to the asset (mandatory)
-  content-type   string   Content type of the asset (for example, “image/jpeg”)
-
- 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d658f63d/docs/data-queries/query-language.md
----------------------------------------------------------------------
diff --git a/docs/data-queries/query-language.md b/docs/data-queries/query-language.md
deleted file mode 100644
index a491740..0000000
--- a/docs/data-queries/query-language.md
+++ /dev/null
@@ -1,427 +0,0 @@
-# Query Language
-
-> Query examples in this content are shown unencoded to make
-> them easier to read. Keep in mind that you might need to encode query
-> strings if you're sending them as part of URLs, such as when you're
-> executing them with the cURL tool.
-
-The following example retrieves a list of restaurants (from a
-restaurants collection) whose name property contains the value "diner",
-sorting the list in ascending order by name:
-
-    /restaurants?ql=select * where name contains 'diner' order by name asc
-
-
-## Basic syntax
-
-Queries of Usergrid data for Apache Usergrid are made up of two kinds of
-statements: the path to the collection you want to query, followed by
-the query language statement containing your query. These two statements
-are separated by "?ql=" to indicate where the query language statement
-starts.
-
-To retrieve items from a collection, you would use a syntax such as the
-following:
-
-    /<collection>?ql=<query_statement>
-
-In the following example, the query is retrieving all users whose name
-is Gladys Kravitz.
-
-    /users?ql=select * where name = 'Gladys Kravitz'
-
-The following example selects all items except those that have an a
-property value of 5:
-
-    /items?ql=select * where NOT a = 5
-
-Note that there is a shortcut available when your query selects all
-items matching certain criteria -- in other words, where you use a
-statement that starts "select \* where". In this case, you can omit the
-first part of the statement and abbreviate it this way:
-
-    /items?ql=NOT a = 5
-
-You query your Apache Usergrid data by using a query syntax that's like
-Structured Query Language (SQL), the query language for relational
-databases. Unlike a relational database, where you specify tables and
-columns containing the data you want to query, in your Apache Usergrid
-queries you specify collections and entities.
-
-The syntax of Apache Usergrid queries only *resembles* SQL to
-make queries familiar and easier to write. However, the language isn't
-SQL. Only the syntax items documented here are supported.
-
-## Supported operators
-
-Comparisons
-
-* Less than `<` or `lt`
-* Less than or equal `<=` or `lte`
-* Equal `=` or `eq`
-* Greater than or equal `>=` or `gte`
-* Greater than `>` or `gt`
-* Not equal `NOT`
-
-Logical operations
-
-* Intersection of results `and`
-* Union of results `or`
-* Subtraction of results `not`
-
-
-## Query Response Format
-
-the query’s response is formatted in
-JavaScript Object Notation (JSON). This is a common format used for
-parameter and return values in REST web services.
-
-So for the following query:
-
-    /users?ql=select * where name = ‘Gladys Kravitz’
-
-...you would get a response such as the the one below. The JSON format
-arranges the data in name/value pairs. Many of the values correspond to
-specifics of the request, including the request’s HTTP action (GET), the
-application’s UUID, the request’s parameters (the query string you
-sent), and so on.
-
-Here, the query is asking for whole entities in the users collection.
-Data corresponding to the response is captured in the response’s
-`entities` array. The array has one member here, corresponding to the
-one user found by the query (another kind of query might have found more
-users). That one member gives the UUID of the entity (user), the entity
-type, and values for properties such as name, username, email, and so
-on.
-
-```json
-{
-  "action" : "get",
-  "application" : "8272c9b0-d86a-11e2-92e2-cdf1ce04c1c0",
-  "params" : {
-    "ql" : [ "select * where name = 'Gladys Kravitz'" ]
-  },
-  "path" : "/users",
-  "uri" : "http://api.usergrid.com/myorg/myapp/users",
-  "entities" : [ {
-    "uuid" : "d0d7d0ba-e97b-11e2-8cef-411c466c4f2c",
-    "type" : "user",
-    "name" : "Gladys Kravitz",
-    "created" : 1373472876859,
-    "modified" : 1373472876859,
-    "username" : "gladys",
-    "email" : "gladys@example.com",
-    "activated" : true,
-    "picture" : "http://www.gravatar.com/avatar/20c57d4f41cf51f2db44165eb058b3b2",
-    "metadata" : {
-      "path" : "/users/d0d7d0ba-e97b-11e2-8cef-411c466c4f2c",
-      "sets" : {
-        "rolenames" : "/users/d0d7d0ba-e97b-11e2-8cef-411c466c4f2c/rolenames",
-        "permissions" : "/users/d0d7d0ba-e97b-11e2-8cef-411c466c4f2c/permissions"
-      },
-      "connections" : {
-        "firstname" : "/users/d0d7d0ba-e97b-11e2-8cef-411c466c4f2c/firstname",
-        "lastname" : "/users/d0d7d0ba-e97b-11e2-8cef-411c466c4f2c/lastname"
-      },
-      "collections" : {
-        "activities" : "/users/d0d7d0ba-e97b-11e2-8cef-411c466c4f2c/activities",
-        "devices" : "/users/d0d7d0ba-e97b-11e2-8cef-411c466c4f2c/devices",
-        "feed" : "/users/d0d7d0ba-e97b-11e2-8cef-411c466c4f2c/feed",
-        "groups" : "/users/d0d7d0ba-e97b-11e2-8cef-411c466c4f2c/groups",
-        "roles" : "/users/d0d7d0ba-e97b-11e2-8cef-411c466c4f2c/roles",
-        "following" : "/users/d0d7d0ba-e97b-11e2-8cef-411c466c4f2c/following",
-        "followers" : "/users/d0d7d0ba-e97b-11e2-8cef-411c466c4f2c/followers"
-      }
-    }
-  } ],
-  "timestamp" : 1374694196061,
-  "duration" : 48,
-  "organization" : "myorg",
-  "applicationName" : "myapp",
-  "count" : 1
-}
-```
-
-Compare the preceding example with the following for another kind of
-query. Imagine the following request string, where the query string is
-asking for only the values of two of the entity’s properties (username
-and name):
-
-    /users?ql=select username,name where name=’Gladys Kravitz’
-
-In the response JSON from this query, the return value is specified as
-the property of the `list` item -- here, an array containing only the
-values of the properties the query asked for, in the order they were
-requested (username first, then name).
-
-    {
-      "action" : "get",
-      "application" : "8272c9b0-d86a-11e2-92e2-cdf1ce04c1c0",
-      "params" : {
-        "ql" : [ "select username,name where name='Gladys Kravitz'" ]
-      },
-      "path" : "/users",
-      "uri" : "http://api.usergrid.com/myorg/myapp/users",
-      "list" : [ [ "gladys", "Gladys Kravitz" ] ],
-      "timestamp" : 1374697463190,
-      "duration" : 25,
-      "organization" : "myorg",
-      "applicationName" : "myapp",
-      "count" : 1
-    }
-
-
-## Data types supported in queries
-
-As you develop queries for your Apache Usergrid data, remember that entity
-properties each conform to a particular data type (whether the entity is
-included by default or an entity you defined). Your queries must
-acknowledge this, testing with values that conform to each property's
-data type. (You can view the list of property data types for the default
-entities at [Default Data Entities](/default-data-entities).)
-
-For example, in the default entity `User`, the `name` property is stored
-as a `string`, the created date as a `long`, and metadata is stored as a
-JSON object. Your queries must be data type-aware so that you can be
-sure that query results are as you expect them to be.
-
-So imagine you define an entity with a `price` property whose value
-might be `100.00`. Querying for `100` will return no results even if
-there are occurrences of `100.00` as `price` values in your data set.
-That's because the database expected a decimal-delimited `float` value
-in your query.
-
-
-Data Type     Examples                                                                                    Notes
------------ ------------------------------------------------------------------------------------------- ---------
-`string`    `'value'`, `unicode '\uFFFF'`, `octal '\0707'`                                              true | false
-`long`      1357412326021                                                                               Timestamps are typically stored as `long` values.
-`float`     10.1, -10.1, 10e10, 10e-10, 10E10, 10e-10                                                   Your query must be specific about the value you're looking for, down to the value (if any) after the decimal point.
-`boolean`   true | false                                      
-`UUID`      ee912c4b-5769-11e2-924d-02e81ac5a17b                                                        UUID types are typically used for the unique IDs of entities. The value must conform to the following format (do not enclose with quotation marks): xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
-
-
-`object`    For a JSON object like this one:
-
-```
-  {
-    "items":[
-      {"name":"rocks"},
-      {"name":"boats"}
-    ]
-  }
-```
-
-you can use dot notation to reach property values in the object: /mycollection/thing?ql="select * where items.name = 'rocks'"                        Objects are often used to contain entity metadata, such as the activities associated with a user, the users associated with a role, and so on.
-
-## Retrieving values for multiple properties
-
-Your query can return multiple kinds of values -- such as the values of
-multiple properties -- by specifying the property names in your select
-statement as a comma-separated list.
-
-For example, the following request returns the address and phone number
-of users whose name is Gladys Kravitz:
-
-    /users?ql=select address,phone_number where name = 'Gladys Kravitz'
-
-
-## Querying for the contents of text
-
-Your query can search the text of entity values of the string data type.
-For example, you can search a postal code field for values that start
-with a specific three numbers.
-
-For example, the following query selects all restaurants with the word
-`diner` in the name:
-
-    /restaurants?ql=select * where name contains 'diner'
-
-**Note:** Not all string properties of the default entities are
-indexed for searching. This includes the `User` entity's `username`
-property.
-
-This will return all users whose name property contains the word 'Kravitz'
-
-    /users?ql=select * where name contains 'Kravitz'
-
-This will return all users whose name property contains a word beginning with 'Krav'
-
-    /users?ql=select * where name contains 'Krav*'
-
-This will return all users whose name is exactly 'Gladys Kravitz'
-
-    /users?ql=select * where name = 'Gladys Kravitz'
-
-
-## Sorting results
-
-You can return query results that are sorted in the order you specify.
-Use the `order by` clause to specify the property to sort by, along with
-the order in which results should be sorted. The syntax for the clause
-is as follows `order by <property_name> asc | desc`
-
-The following table includes a few examples:
-
-    /users?ql=select * where lastname = 'Smith' order by firstname asc
-
-
-    /users?ql=select * where lastname = 'Smith' order by firstname desc
-
-
-    /users?ql=select * where lastname contains 'Sm*' order by lastname asc, firstname asc
-
-
-## Geoqueries
-
-Many of today's apps are enhanced by the use of *geolocation*, wireless
-detection of the physical location of a remote device. These apps are
-said to be *geolocation-aware* in that they query the device to
-determine the user's position and then use this data to further enhance
-the user's experience. For example, apps can capture the exact location
-where a picture was taken or a message was created.
-
-Usergrid support geolocation on any entity, both built in (e.g.,
-users, groups) and user defined.
-
-To add a location to any entity, include the following member to the
-JSON in a POST or PUT call:
-
-    "location": {
-        "latitude": 37.779632,
-        "longitude": -122.395131  
-    } 
-
-For example, to store a listing of restaurants and their locations,
-start by creating a collection called restaurants:
-
-    POST https://api.usergrid.com/org_name/app_name/restaurants
-
-Next, add a new entity to the collection:
-
-    POST https://api.usergrid.com/org_name/app_name/restaurants
-    {
-      "name": "Rockadero",
-      "address": "21 Slate Street, Bedrock, CA",
-      "location": {
-        "latitude": 37.779632,
-        "longitude": -122.395131
-      }
-    }
-
-This creates a new restaurant entity called "Rockadero" with the
-longitude and latitude included as part of the object.
-
-When a location is added to an entity, it is easy to make queries
-against that data. For example, to see all restaurants within a 10 mile
-radius of the user's location, make a GET call against that entity, and
-include a search query in the following format:
-
-    location within <distance in meters> of <latitude>, <longitude>
-
-If we use the location of our user Fred, we first need to convert miles
-to meters. 1 mile is equivalent to 1609.344 meters, so 10 miles is about
-16093 meters. Thus, the API call looks like this:
-
-    GET https://api.usergrid.com/org_name/app_name/restaurants?ql=location within 16093 of 37.776753, -122.407846
-
-
-## Managing large sets of results
-
-When your query might return more results than you want to display to
-the user at once, you can use the limit parameter with cursors or API
-methods to manage the display of results. By default, query results are
-limited to 10 at a time. You can adjust this by setting the limit
-parameter to a value you prefer.
-
-For example, you might execute a query that could potentially return
-hundreds of results, but you want to display 20 of those at a time to
-users. To do this, your code sets the limit parameter to 20 when
-querying for data, then provides a way for the user to request more of
-the results when they're ready.
-
-You would use the following parameters in your query:
-
-+-------------------------+-------------------------+-------------------------+
-| Parameter               | Type                    | Description             |
-+=========================+=========================+=========================+
-| `limit`                 | integer                 | Number of results to    |
-|                         |                         | return. The maximum     |
-|                         |                         | number of results is    |
-|                         |                         | 1,000. Specifying a     |
-|                         |                         | limit greater than      |
-|                         |                         | 1,000 will result in a  |
-|                         |                         | limit of 1,000.         |
-|                         |                         |                         |
-|                         |                         | Limit is applied to the |
-|                         |                         | collection, not the     |
-|                         |                         | query string. For       |
-|                         |                         | example, the following  |
-|                         |                         | query will find the     |
-|                         |                         | first 100 entities in   |
-|                         |                         | the books collection,   |
-|                         |                         | then from that set      |
-|                         |                         | return the ones with    |
-|                         |                         | author='Hemingway':     |
-|                         |                         |                         |
-|                         |                         |     /books?ql=author =  |
-|                         |                         | 'Hemingway'&limit=100   |
-|                         |                         |                         |
-|                         |                         | You can also use the    |
-|                         |                         | limit parameter on a    |
-|                         |                         | request without a query |
-|                         |                         | string. The following   |
-|                         |                         | example is shorthand    |
-|                         |                         | for selecting all books |
-|                         |                         | and limiting by 100 at  |
-|                         |                         | a time:                 |
-|                         |                         |                         |
-|                         |                         |     /books?limit=100    |
-|                         |                         |                         |
-|                         |                         | Using a limit on a      |
-|                         |                         | DELETE can help you     |
-|                         |                         | manage the amount of    |
-|                         |                         | time it takes to delete |
-|                         |                         | data. For example you   |
-|                         |                         | can delete all of the   |
-|                         |                         | books, 1000 at a time,  |
-|                         |                         | with the following:     |
-|                         |                         |                         |
-|                         |                         |     DELETE /books?limit |
-|                         |                         | =1000                   |
-|                         |                         |                         |
-|                         |                         | Keep in mind that       |
-|                         |                         | DELETE operations can   |
-|                         |                         | take longer to execute. |
-|                         |                         | Yet even though the     |
-|                         |                         | DELETE query call might |
-|                         |                         | time out (such as with  |
-|                         |                         | a very large limit),    |
-|                         |                         | the operation will      |
-|                         |                         | continue on the server  |
-|                         |                         | even if the client      |
-|                         |                         | stops waiting for the   |
-|                         |                         | result.                 |
-+-------------------------+-------------------------+-------------------------+
-| `cursor`                | string                  | An encoded              |
-|                         |                         | representation of the   |
-|                         |                         | query position pointing |
-|                         |                         | to a set of results. To |
-|                         |                         | retrieve the next set   |
-|                         |                         | of results, pass the    |
-|                         |                         | cursor with your next   |
-|                         |                         | call for most results.  |
-+-------------------------+-------------------------+-------------------------+
-
-For example:
-
-Select all users whose name starts with fred, and returns the first 50
-results:
-
-    /users?ql=select * where name = 'fred*'&limit=50
-
-Retrieve the next batch of users whose name is "fred", passing the
-cursor received from the last request to specify where the next set of
-results should begin:
-
-    /users?ql=select * where name = 'fred*'&limit=50&cursor=LTIxNDg0NDUxNDpnR2tBQVFFQWdITUFDWFJ2YlM1emJXbDBhQUNBZFFBUUQyMVZneExfRWVLRlV3TG9Hc1doZXdDQWRRQVFIYVdjb0JwREVlS1VCd0xvR3NWT0JRQQ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d658f63d/docs/entity-connections/relationships.md
----------------------------------------------------------------------
diff --git a/docs/entity-connections/relationships.md b/docs/entity-connections/relationships.md
deleted file mode 100644
index 73bc6c3..0000000
--- a/docs/entity-connections/relationships.md
+++ /dev/null
@@ -1,98 +0,0 @@
-# Relationships
-
-## Creating connections between entities
-
-One of the most useful features of Usergrid is the ability to create
-connections between entities. A simple example of this is the
-Twitter-like use of *following*, where one user forms a connection with
-another by subscribing to any tweets they post. [Messagee
-Example](/messagee-example) walks you through an example of following
-other users in our sample app, *Messagee*. Here is the basic format:
-
-    POST https://api.usergrid.com/my-org/my-app/users/fred/following/users/barney
-
-This API call results in two users, Fred and Barney, linked with a
-connection where Fred is following Barney.
-
-If you create a *following* connection between two users, Apache Usergrid
-automatically creates a virtual connection called *followers* that
-mirrors the *following* connection. In other words, if you create a
-connection where Fred is following Barney, Apache Usergrid automatically
-creates a virtual connection where Fred is a follower of Barney.
-
-Note that there is no mirror connection established. Apache Usergrid only
-creates a mirror connection when you create a *following* connection. It
-does not create a mirror connection for other verbs such as likes.
-
-You can see all the users that Fred is following, in this case only
-Barney, by making the following API call:
-
-    GET https://api.usergrid.com/my-org/my-app/users/fred/following
-
-You can see all of barney’s followers, in this case only Fred, by making
-the following API call:
-
-    GET https://api.usergrid.com/my-org/my-app/users/barney/followers
-
-The *followers* connection is a virtual connection because you can’t use
-it to link two entities. In other words, you can’t make fred a follower
-of barney by using a *followers* connection.  **This is wrong:**
-
-    POST https://api.usergrid.com/my-org/my-app/users/barney/followers/users/fred
-
-To create a *following* connection with the users switched, so that
-Barney is following Fred, do this:
-
-    POST https://api.usergrid.com/my-org/my-app/users/barney/following/users/fred
-
-You can now see Fred’s followers (only Barney) by making the following
-call:
-
-    GET https://api.usergrid.com/my-org/my-app/users/fred/followers
-
-## Creating other connections
-
-You can extend this connection structure to create connections using any
-"verb" that can link two entities. For example, you could use likes to
-denote a connection between a user and his dog. First, create a dogs
-collection:
-
-    POST https://api.usergrid.com/my-org/my-app/dogs
-
-Then populate this collection with a new dog named Dino:
-
-    POST https://api.usergrid.com/my-org/my-app/dogs {"name" : "dino"}
-
-Then create a likes connection between Fred and his dog Dino:
-
-    POST https://api.usergrid.com/my-org/my-app/users/fred/likes/dogs/dino
-
-Getting connections
--------------------
-
-### Get all connections for an entity
-
-To get a list that only contains the connections, do a GET on the
-connections sub-property of the entity:
-
-    GET https://api.usergrid.com/my-org/my-app/users/fred/connections
-
-### Get information on a specific connection type
-
-To get a list of users who like Fred:
-
-    GET https://api.usergrid.com/my-org/my-app/users/fred/connecting/likes
-
-To get a list of all dogs that Fred likes:
-
-    GET https://api.usergrid.com/my-org/my-app/users/fred/likes/dog
-
-Deleting a connection
----------------------
-
-You can delete a connection in a way similar to creating one. Just
-replace the POST method with the DELETE method. For example, you can
-delete the connection between fred and barney with the following API
-call:
-
-    DELETE https://api.usergrid.com/my-org/my-app/users/fred/following/barney

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d658f63d/docs/geolocation/tbd.md
----------------------------------------------------------------------
diff --git a/docs/geolocation/tbd.md b/docs/geolocation/tbd.md
deleted file mode 100644
index 279d128..0000000
--- a/docs/geolocation/tbd.md
+++ /dev/null
@@ -1 +0,0 @@
-# COMING SOON...
\ No newline at end of file