Merge branch 'push-debug' of http://192.168.2.236:10080/louhr/push into push-debug

Conflicts:
	graph/src/main/resources/bolt.properties
	graphdb/src/main/java/org/diagbot/service/impl/KnowledgeServiceImpl.java

push-web/src/main/resources/static/dist/js/push.js

@@ -1,6 +1,6 @@
-var nlp_web_url = "http://192.168.2.186:5002/nlp-web";
-var bigdata_web_url = "http://192.168.2.186:5001/bigdata-web";
-var graph_web_url = "http://192.168.2.186:5003/graph-web";
+var nlp_web_url = "http://192.168.2.234:5002/nlp-web";
+var bigdata_web_url = "http://192.168.2.234:5001/bigdata-web";
+var graph_web_url = "http://192.168.2.234:5003/graph-web";
 // var push_web_url = "http://192.168.2.234:5008/push-web";
 
 // var nlp_web_url = "http://192.168.3.180:5002/nlp-web";