streaming
Merge branch 'Mary' of https://github.com/gdmmmy/IntelligentWeb into Mary

Conflicts:
	.gitignore
	.project
	.settings/.jsdtscope
	.settings/org.eclipse.jdt.core.prefs
	.settings/org.eclipse.wst.common.component
	.settings/org.eclipse.wst.common.project.facet.core.xml
	.settings/org.eclipse.wst.jsdt.ui.superType.container
	.settings/org.eclipse.wst.jsdt.ui.superType.name
	WebContent/META-INF/MANIFEST.MF
	WebContent/WEB-INF/classes/foursquare-api-1.0.2-javadoc.jar
	WebContent/WEB-INF/classes/foursquare-api-1.0.2-sources.jar
	WebContent/WEB-INF/classes/foursquare-api-1.0.2.jar
	WebContent/WEB-INF/classes/gson-2.2.4-javadoc.jar
	WebContent/WEB-INF/classes/gson-2.2.4-sources.jar
	WebContent/WEB-INF/classes/gson-2.2.4.jar
	WebContent/WEB-INF/classes/json-20090211.jar
	WebContent/WEB-INF/classes/json-lib-2.1.jar
	WebContent/WEB-INF/classes/json-lib-2.4-jdk15-javadoc.jar
	WebContent/WEB-INF/classes/json-lib-2.4-jdk15-sources.jar
	WebContent/WEB-INF/classes/json-lib-2.4-jdk15.jar
	WebContent/WEB-INF/classes/mjk/foursquare/ConnectWithTwitter.class
	WebContent/WEB-INF/classes/mjk/foursquare/FindNearbyLocation.class
	WebContent/WEB-INF/classes/mjk/model/CheckinModel.class
	WebContent/WEB-INF/classes/mjk/model/DatabaseConnection.class
	WebContent/WEB-INF/classes/mjk/model/JsonTweetsOperation$1.class
	WebContent/WEB-INF/classes/mjk/model/JsonTweetsOperation.class
	WebContent/WEB-INF/classes/mjk/model/JsonUserOperation$1.class
	WebContent/WEB-INF/classes/mjk/model/JsonUserOperation.class
	WebContent/WEB-INF/classes/mjk/model/JsonVenuesOperation$1.class
	WebContent/WEB-INF/classes/mjk/model/JsonVenuesOperation.class
	WebContent/WEB-INF/classes/mjk/model/TweeterModel.class
	WebContent/WEB-INF/classes/mjk/model/UserModel.class
	WebContent/WEB-INF/classes/mjk/model/VenuesModel.class
	WebContent/WEB-INF/classes/mjk/query/servlet/QueryDiscussion.class
	WebContent/WEB-INF/classes/mjk/query/servlet/QueryFrequency.class

WebContent/WEB-INF/classes/mjk/query/servlet/QueryLocationFromTweets.cla
ss

WebContent/WEB-INF/classes/mjk/query/servlet/QueryTweetsFromLocation.cla
ss
	WebContent/WEB-INF/classes/mjk/twitter/FindLocationStreamingApi$1.class
	WebContent/WEB-INF/classes/mjk/twitter/FindLocationStreamingApi.class
	WebContent/WEB-INF/classes/mjk/twitter/FindTweetStreamingApi$1.class
	WebContent/WEB-INF/classes/mjk/twitter/FindTweetStreamingApi.class
	WebContent/WEB-INF/classes/mjk/twitter/InitConnectionTwitter.class
	WebContent/WEB-INF/classes/mjk/twitter/RSETAPI.class
	WebContent/WEB-INF/classes/mjk/twitter/Specific_discussion.class
	WebContent/WEB-INF/classes/mjk/twitter/Specific_user.class
	WebContent/WEB-INF/classes/mjk/twitter/StreamingListening$1.class
	WebContent/WEB-INF/classes/mjk/twitter/StreamingListening.class
	WebContent/WEB-INF/classes/mjk/twitter/test.class
	WebContent/WEB-INF/classes/mysql-connector-java-5.1.29-bin.jar
	WebContent/WEB-INF/classes/twitter4j-async-3.0.5.jar
	WebContent/WEB-INF/classes/twitter4j-core-3.0.5.jar
	WebContent/WEB-INF/classes/twitter4j-examples-3.0.5.jar
	WebContent/WEB-INF/classes/twitter4j-media-support-3.0.5.jar
	WebContent/WEB-INF/classes/twitter4j-stream-3.0.5.jar
	WebContent/WEB-INF/jquery/jquery-1.11.1.min.js
	WebContent/WEB-INF/lib/foursquare-api-1.0.2-javadoc.jar
	WebContent/WEB-INF/lib/foursquare-api-1.0.2-sources.jar
	WebContent/WEB-INF/lib/foursquare-api-1.0.2.jar
	WebContent/WEB-INF/lib/gson-2.2.4-javadoc.jar
	WebContent/WEB-INF/lib/gson-2.2.4-sources.jar
	WebContent/WEB-INF/lib/gson-2.2.4.jar
	WebContent/WEB-INF/lib/json-20090211.jar
	WebContent/WEB-INF/lib/json-lib-2.1.jar
	WebContent/WEB-INF/lib/json-lib-2.4-jdk15-javadoc.jar
	WebContent/WEB-INF/lib/json-lib-2.4-jdk15-sources.jar
	WebContent/WEB-INF/lib/json-lib-2.4-jdk15.jar
	WebContent/WEB-INF/lib/mysql-connector-java-5.1.29-bin.jar
	WebContent/WEB-INF/lib/twitter4j-async-3.0.5.jar
	WebContent/WEB-INF/lib/twitter4j-core-3.0.5.jar
	WebContent/WEB-INF/lib/twitter4j-examples-3.0.5.jar
	WebContent/WEB-INF/lib/twitter4j-media-support-3.0.5.jar
	WebContent/WEB-INF/lib/twitter4j-stream-3.0.5.jar
	WebContent/WEB-INF/stop_list.txt
	WebContent/WEB-INF/web.xml
	WebContent/queryInterface.html
	WebContent/queryInterface.html.bak
	WebContent/styles.css
	src/conn/config.properties
	src/mjk/conncetion.properties
	src/mjk/foursquare/ConnectWithTwitter.java
	src/mjk/foursquare/FindNearbyLocation.java
	src/mjk/model/CheckinModel.java
	src/mjk/model/ContactsModel.java
	src/mjk/model/CountingModel.java
	src/mjk/model/DatabaseConnection.java
	src/mjk/model/FrequencyModel.java
	src/mjk/model/JsonOperation.java
	src/mjk/model/JsonTweetsOperation.java
	src/mjk/model/JsonUserOperation.java
	src/mjk/model/JsonVenuesOperation.java
	src/mjk/model/Snippet.java
	src/mjk/model/TweetModel.java
	src/mjk/model/TweeterModel.java
	src/mjk/model/UserModel.java
	src/mjk/model/UsersModel.java
	src/mjk/model/VenuesModel.java
	src/mjk/query/servlet/QueryDiscussion.java
	src/mjk/query/servlet/QueryFrequency.java
	src/mjk/query/servlet/QueryLocationFromTweets.java
	src/mjk/query/servlet/QueryTweetsFromLocation.java
	src/mjk/twitter/FindLocationStreamingApi.java
	src/mjk/twitter/FindTweetStreamingApi.java
	src/mjk/twitter/InitConnectionTwitter.java
	src/mjk/twitter/RSETAPI.java
	src/mjk/twitter/Specific_discussion.java
	src/mjk/twitter/Specific_user.java
	src/mjk/twitter/test.java