merged

Author: Vladlukhanin

.gitignore

@@ -13,3 +13,6 @@ quickblox.js
 
 #jasmine-npm generate
 .grunt
+
+# Cordova build
+**/build

.jshintrc

@@ -5,7 +5,8 @@
   "browserify" : true,
   "jasmine"    : true,
   "jquery"     : true,
-  "predef"     : [
+  "esnext"     : true,
+  "globals"     : [
     "jasmine",
     "describe",
     "xdescribe",

README.md

@@ -1,7 +1,7 @@
 {
   "name": "quickblox",
   "description": "QuickBlox JavaScript SDK",
-  "version": "2.1.5",
+  "version": "2.3.1",
   "homepage": "https://quickblox.com/developers/Javascript",
   "main": "quickblox.js",
   "license": "Apache 2.0",

bower.json

@@ -1,15 +1,10 @@
 {
   "name": "quickblox",
   "description": "QuickBlox JavaScript SDK",
-  "version": "2.1.5",
+  "version": "2.3.1",
   "homepage": "https://quickblox.com/developers/Javascript",
   "main": "src/qbMain.js",
-  "license": [
-    {
-      "type": "Apache 2.0",
-      "url": "https://github.com/QuickBlox/quickblox-javascript-sdk/blob/master/LICENSE"
-    }
-  ],
+  "license" : "(Apache-2.0)",
   "keywords": [
     "quickblox",
     "javascript",
@@ -43,12 +38,13 @@
   "dependencies": {
     "crypto-js": "3.1.2-2",
     "jquery": "^2.2.0",
+    "node-xmpp-client": "^3.0.0",
     "request": "^2.48.0",
-    "strophe": "~1.2.4",
+    "strophe.js": "^1.2.8",
     "xml2js": "^0.4.13"
   },
   "devDependencies": {
-    "ghooks": "^1.0.3",
+    "ghooks": "^1.3.2",
     "grunt": "^0.4.5",
     "grunt-browserify": "^3.2.1",
     "grunt-contrib-connect": "^0.9.0",