Merge branch 'stable-3.1' into 'stable-3.1'

Marius Burkard

2016-07-05 3cc04cc5219bfd72d83b58d2f6ae83092e0c9fb6

 interface/web/admin/templates/server_ip_list.htm

@@ -62,8 +62,3 @@
                </tfoot>
            </table>
</div>
<script>
$(document).ready(function(){
   $('[data-toggle="tooltip"]').tooltip();
});
</script>