Merge https://github.com/redmatrix/hubzilla into pending_merge

view/tpl/acl_selector.tpl

@@ -9,19 +9,22 @@
 				<div id="acl-wrapper">
 					<button id="acl-showall" class="btn btn-block btn-default"><i class="icon-globe"></i> {{$showall}}</button>
 					<input type="text" id="acl-search" placeholder="&#xf002;">
+
+				{{if $jotnets}}
+				{{$jotnets}}
+				{{/if}}
 					<div id="acl-list">
 						<div id="acl-list-content"></div>
+
 					</div>
 					<span id="acl-fields"></span>
 				</div>
+
 				<div class="acl-list-item" rel="acl-template" style="display:none">
 					<img data-src="{0}"><p>{1}</p>
 					<button class="acl-button-hide btn btn-xs btn-default"><i class="icon-remove"></i> {{$hide}}</button>
 					<button class="acl-button-show btn btn-xs btn-default"><i class="icon-ok"></i> {{$show}}</button>
 				</div>
-				{{if $jotnets}}
-				{{$jotnets}}
-				{{/if}}
 			</div>
 			<div class="modal-footer clear">
 				<button type="button" class="btn btn-default" data-dismiss="modal">{{$aclModalDismiss}}</button>