diff --git a/app/config/version.php b/app/config/version.php
index cc844071a1..ed1d1e6150 100644
--- a/app/config/version.php
+++ b/app/config/version.php
@@ -1,5 +1,5 @@
 <?php
 return array (
   'app_version' => 'v2.0.5-pre',
-  'hash_version' => 'v2.0.5-pre-131-g4a49e6f',
+  'hash_version' => 'v2.0.5-pre-133-gc24f172',
 );
\ No newline at end of file
diff --git a/app/controllers/admin/GroupsController.php b/app/controllers/admin/GroupsController.php
index eb394c67ef..74105f8981 100755
--- a/app/controllers/admin/GroupsController.php
+++ b/app/controllers/admin/GroupsController.php
@@ -22,9 +22,6 @@ class GroupsController extends AdminController
      */
     public function getIndex()
     {
-        // Grab all the groups
-        $groups = Sentry::getGroupProvider()->createModel()->paginate();
-
         // Show the page
         return View::make('backend/groups/index', compact('groups'));
     }
@@ -215,4 +212,78 @@ class GroupsController extends AdminController
         }
     }
 
+
+
+    public function getDatatable($status = null)
+    {
+
+        if (Input::has('offset')) {
+            $offset = e(Input::get('offset'));
+        } else {
+            $offset = 0;
+        }
+
+        if (Input::has('limit')) {
+            $limit = e(Input::get('limit'));
+        } else {
+            $limit = 50;
+        }
+
+        if (Input::get('sort')=='name') {
+            $sort = 'first_name';
+        } else {
+            $sort = e(Input::get('sort'));
+        }
+
+        // Grab all the groups
+        $groups = Sentry::getGroupProvider()->createModel();
+        //$users = Company::scopeCompanyables($users);
+
+         if (Input::has('search')) {
+             $groups = $users->TextSearch(Input::get('search'));
+         }
+
+         $order = Input::get('order') === 'asc' ? 'asc' : 'desc';
+
+        $allowed_columns =
+         [
+           'name','created_at'
+         ];
+
+        $sort = in_array($sort, $allowed_columns) ? $sort : 'name';
+        $groups = $groups->orderBy($sort, $order);
+
+        $groupsCount = $groups->count();
+        $groups = $groups->skip($offset)->take($limit)->get();
+        $rows = array();
+
+        foreach ($groups as $group)
+        {
+            $group_names = '';
+            $inout = '';
+            $actions = '<nobr>';
+
+            $actions .= '<a href="' . route('update/group', $group->id) . '" class="btn btn-warning btn-sm"><i class="fa fa-pencil icon-white"></i></a> ';
+
+            if (!Config::get('app.lock_passwords')) {
+                  $actions .= '<a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="' . route('delete/group', $group->id) . '" data-content="'.Lang::get('admin/groups/message.delete.confirm').'" data-title="Delete ' . htmlspecialchars($group->name) . '?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a> ';
+              } else {
+                  $actions .= ' <span class="btn delete-asset btn-danger btn-sm disabled"><i class="fa fa-trash icon-white"></i></span>';
+              }
+
+            $actions .= '</nobr>';
+
+            $rows[] = array(
+                'id'         => $group->id,
+                'name'        => $group->name,
+                'users'         => $group->users->count(),
+                'created_at'        => $group->created_at->format('Y-m-d H:i:s'),
+                'actions'       => ($actions) ? $actions : '',
+            );
+        }
+
+        $data = array('total'=>$groupsCount, 'rows'=>$rows);
+        return $data;
+    }
+
 }
diff --git a/app/routes.php b/app/routes.php
index 321a9e110d..6a7b35abb0 100755
--- a/app/routes.php
+++ b/app/routes.php
@@ -80,6 +80,11 @@
             Route::get( 'list/{status?}', [ 'as' => 'api.users.list', 'uses' => 'UsersController@getDatatable' ] );
         } );
 
+        /*---Groups API---*/
+        Route::group( [ 'prefix' => 'groups' ], function () {
+            Route::get( 'list', [ 'as' => 'api.groups.list', 'uses' => 'GroupsController@getDatatable' ] );
+        } );
+
         /*---Licenses API---*/
         Route::group( [ 'prefix' => 'licenses' ], function () {
 
diff --git a/app/views/backend/groups/index.blade.php b/app/views/backend/groups/index.blade.php
index 89acb7767e..6f7dccb5a2 100755
--- a/app/views/backend/groups/index.blade.php
+++ b/app/views/backend/groups/index.blade.php
@@ -18,41 +18,68 @@
 </div>
 
 
+<div class="row">
+
+       <table
+        name="groups"
+        id="table"
+        data-toggle="table"
+        data-url="{{ route('api.groups.list') }}"
+        data-cookie="true"
+        data-click-to-select="true"
+        data-cookie-id-table="userGroupDisplay-v{{ Config::get('version.app_version') }}">
+           <thead>
+               <tr>
+                   <th data-switchable="true" data-sortable="false" data-field="id" data-visible="false">@lang('general.id')</th>
+                   <th data-switchable="true" data-sortable="true" data-field="name" data-visible="true">@lang('admin/groups/table.name')</th>
+                   <th data-switchable="true" data-sortable="false" data-field="users" data-visible="true">@lang('admin/groups/table.users')</th>
+                   <th data-switchable="true" data-sortable="true" data-field="created_at" data-visible="true">@lang('general.created_at')</th>
+                   <th data-switchable="false" data-searchable="false" data-sortable="false" data-field="actions" >{{ Lang::get('table.actions') }}</th>
+               </tr>
+           </thead>
+       </table>
 
-<div class="row form-wrapper">
-<div class="table-responsive">
-<table class="table table-hover">
-    <thead>
-        <tr role="row">
-            <th class="col-md-3">@lang('admin/groups/table.name')</th>
-            <th class="col-md-2"><span class="line"></span>@lang('admin/groups/table.users')</th>
-            <th class="col-md-2"><span class="line"></span>@lang('general.created_at')</th>
-            <th class="col-md-1 actions"><span class="line"></span>@lang('table.actions')</th>
-        </tr>
-    </thead>
-    <tbody>
-        @if ($groups->count() >= 1)
-        @foreach ($groups as $group)
-        <tr>
-            <td>{{ $group->name }}</td>
-            <td>{{ $group->users()->count() }}</td>
-            <td>{{ $group->created_at->diffForHumans() }}</td>
-            <td>
-                <a href="{{ route('update/group', $group->id) }}" class="btn btn-warning btn-sm {{ (Config::get('app.lock_passwords')) ? ' disabled': '' }}"><i class="fa fa-pencil icon-white"></i></a>
-                <a data-html="false" class="btn delete-asset btn-danger btn-sm {{ (Config::get('app.lock_passwords')) ? ' disabled': '' }}" data-toggle="modal" href="{{ route('delete/group', $group->id) }}" data-content="@lang('admin/groups/message.delete.confirm')"
-data-title="@lang('general.delete')"
-{{ htmlspecialchars($group->name) }}?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a>
-            </td>
-        </tr>
-        @endforeach
-        @else
-        <tr>
-            <td colspan="5">@lang('general.no_results')</td>
-        </tr>
-        @endif
-    </tbody>
-</table>
 </div>
 </div>
+@section('moar_scripts')
+<script src="{{ asset('assets/js/bootstrap-table.js') }}"></script>
+<script src="{{ asset('assets/js/extensions/cookie/bootstrap-table-cookie.js') }}"></script>
+<script src="{{ asset('assets/js/extensions/mobile/bootstrap-table-mobile.js') }}"></script>
+<script src="{{ asset('assets/js/extensions/export/bootstrap-table-export.js') }}"></script>
+<script src="{{ asset('assets/js/extensions/export/tableExport.js') }}"></script>
+<script src="{{ asset('assets/js/extensions/export/jquery.base64.js') }}"></script>
+<script type="text/javascript">
+    $('#table').bootstrapTable({
+        classes: 'table table-responsive table-no-bordered',
+        undefinedText: '',
+        iconsPrefix: 'fa',
+        showRefresh: true,
+        search: true,
+        pageSize: {{{ Setting::getSettings()->per_page }}},
+        pagination: true,
+        sidePagination: 'server',
+        sortable: true,
+        cookie: true,
+        cookieExpire: '2y',
+        mobileResponsive: true,
+        showExport: true,
+        showColumns: true,
+        exportDataType: 'all',
+        exportTypes: ['csv', 'txt','json', 'xml'],
+        maintainSelected: true,
+        paginationFirstText: "@lang('general.first')",
+        paginationLastText: "@lang('general.last')",
+        paginationPreText: "@lang('general.previous')",
+        paginationNextText: "@lang('general.next')",
+        pageList: ['10','25','50','100','150','200'],
+        icons: {
+            paginationSwitchDown: 'fa-caret-square-o-down',
+            paginationSwitchUp: 'fa-caret-square-o-up',
+            columns: 'fa-columns',
+            refresh: 'fa-refresh'
+        },
 
+    });
+</script>
+@stop
 @stop