Merge remote-tracking branch 'origin/fix/buildAPI' into fix/buildAPI

# Conflicts:
#	package.json

package.json

@@ -16,7 +16,7 @@
                 "build_server_script": "cd o2server && mvn clean && mvn install",
                 "build_web": "gulp build_web",
                 "build_api_version": "jsdoc -c o2web/jsdoc.conf.json -q version=${VAPI}",
-                "build_api": "jsdoc -c o2web/jsdoc.conf.json  -q version=",
+                "build_api": "jsdoc -c o2web/jsdoc.conf.json -q ",
                 "build_parallel": "npm run build_server && npm run build_api &&  npm run build_web",
                 "deploy": "gulp deploy",
                 "deploy:win": "gulp deploy --e windows",