Merge branch 'dev' into feature-media

Changelog

@@ -1,3 +1,5 @@
+2016-05-26 DariusIII
+	* Upd: Update composer.lock file with new versions of datatables and jquery.
 2016-05-24 DariusIII
 	* Chg: Rename groupid column to groups_id.
 	* Upd: Improve speed of update_releases on larger databases

composer.lock

@@ -345,16 +345,16 @@
         },
         {
             "name": "bower-asset/datatables",
-            "version": "1.10.11",
+            "version": "1.10.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/DataTables/DataTables.git",
-                "reference": "d0163e24a0735ef3c0f04886be301baba67482e1"
+                "reference": "3a432c5db3546b2ef0c192f2ae367811cb5edb9b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/DataTables/DataTables/zipball/d0163e24a0735ef3c0f04886be301baba67482e1",
-                "reference": "d0163e24a0735ef3c0f04886be301baba67482e1",
+                "url": "https://api.github.com/repos/DataTables/DataTables/zipball/3a432c5db3546b2ef0c192f2ae367811cb5edb9b",
+                "reference": "3a432c5db3546b2ef0c192f2ae367811cb5edb9b",
                 "shasum": ""
             },
             "require": {
@@ -642,16 +642,16 @@
         },
         {
             "name": "bower-asset/jquery-2.2.x",
-            "version": "2.2.3",
+            "version": "2.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/jquery/jquery-dist.git",
-                "reference": "af22a351b2ea5801ffb1695abb3bb34d5bed9198"
+                "reference": "c0185ab7c75aab88762c5aae780b9d83b80eda72"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/jquery/jquery-dist/zipball/af22a351b2ea5801ffb1695abb3bb34d5bed9198",
-                "reference": "af22a351b2ea5801ffb1695abb3bb34d5bed9198",
+                "url": "https://api.github.com/repos/jquery/jquery-dist/zipball/c0185ab7c75aab88762c5aae780b9d83b80eda72",
+                "reference": "c0185ab7c75aab88762c5aae780b9d83b80eda72",
                 "shasum": ""
             },
             "type": "bower-asset-library",