changed to json format
changed to json format
Merge branch 'master' of https://github.com/Kevinwalters/CloudAssignment2

Conflicts:
	.classpath
	.project
	.settings/org.eclipse.jdt.core.prefs
	.settings/org.eclipse.wst.common.component
	.settings/org.eclipse.wst.common.project.facet.core.xml
	WebContent/META-INF/LICENSE.txt
	WebContent/META-INF/MANIFEST.MF
	WebContent/META-INF/NOTICE.txt
	WebContent/WEB-INF/classes/api_key.txt
	WebContent/WEB-INF/classes/app/SNSHelper.class
	WebContent/WEB-INF/classes/app/SNSMessage.class
	WebContent/WEB-INF/classes/app/SQSreceive.class
	WebContent/WEB-INF/classes/app/SimpleQueueServiceSample.class
	WebContent/WEB-INF/classes/app/TranscoderSNSServlet.class
	WebContent/WEB-INF/classes/app/Tweet.class
	WebContent/WEB-INF/classes/app/TweetGet$1.class
	WebContent/WEB-INF/classes/app/TweetGet.class
	WebContent/WEB-INF/classes/app/TwitterDAO.class
	WebContent/WEB-INF/classes/app/Worker.class
	WebContent/WEB-INF/classes/app/db_Tweets.class
	WebContent/WEB-INF/lib/aspectjrt.jar
	WebContent/WEB-INF/lib/aspectjweaver.jar
	WebContent/WEB-INF/lib/aws-java-sdk-1.9.7-javadoc.jar
	WebContent/WEB-INF/lib/aws-java-sdk-1.9.7-sources.jar
	WebContent/WEB-INF/lib/aws-java-sdk-1.9.7.jar
	WebContent/WEB-INF/lib/aws-java-sdk-flow-build-tools-1.9.7.jar
	WebContent/WEB-INF/lib/commons-codec-1.6.jar
	WebContent/WEB-INF/lib/commons-logging-1.1.3.jar
	WebContent/WEB-INF/lib/freemarker-2.3.18.jar
	WebContent/WEB-INF/lib/httpclient-4.3.jar
	WebContent/WEB-INF/lib/httpcore-4.3.jar
	WebContent/WEB-INF/lib/jackson-annotations-2.3.0.jar
	WebContent/WEB-INF/lib/jackson-core-2.3.2.jar
	WebContent/WEB-INF/lib/jackson-databind-2.3.2.jar
	WebContent/WEB-INF/lib/javax.mail-api-1.4.6.jar
	WebContent/WEB-INF/lib/joda-time-2.2.jar
	WebContent/WEB-INF/lib/mysql-connector-java-5.0.8-bin.jar
	WebContent/WEB-INF/lib/servlet-api.jar
	WebContent/WEB-INF/lib/spring-beans-3.0.7.jar
	WebContent/WEB-INF/lib/spring-context-3.0.7.jar
	WebContent/WEB-INF/lib/spring-core-3.0.7.jar
	WebContent/WEB-INF/lib/twitter4j-async-4.0.2.jar
	WebContent/WEB-INF/lib/twitter4j-core-4.0.2.jar
	WebContent/WEB-INF/lib/twitter4j-examples-4.0.2.jar
	WebContent/WEB-INF/lib/twitter4j-media-support-4.0.2.jar
	WebContent/WEB-INF/lib/twitter4j-stream-4.0.2.jar
	WebContent/WEB-INF/web.xml
	WebContent/cronjob.txt
	WebContent/index.jsp
	WebContent/static/markerclusterer.js
	build/classes/AwsCredential.properties
	build/classes/api_key.txt
	build/classes/app/Tweet.class
	build/classes/app/TweetGet$1.class
	build/classes/app/TweetGet.class
	build/classes/app/TwitterDAO.class
	build/classes/app/db_Tweets.class
	lib/camel-twitter-2.10.3.jar
	lib/mapsengine-api-java-wrapper-0.2.jar
	lib/mapsengine-api-java-wrapper-github/.gitignore
	lib/mapsengine-api-java-wrapper-github/.travis.yml
	lib/mapsengine-api-java-wrapper-github/LICENSE
	lib/mapsengine-api-java-wrapper-github/README.md
	lib/mapsengine-api-java-wrapper-github/build.gradle
	lib/mapsengine-api-java-wrapper-github/gradle.properties
	lib/mapsengine-api-java-wrapper-github/gradle/wrapper/gradle-wrapper.jar
	lib/mapsengine-api-java-wrapper-github/gradle/wrapper/gradle-wrapper.properties
	lib/mapsengine-api-java-wrapper-github/gradlew
	lib/mapsengine-api-java-wrapper-github/gradlew.bat
	lib/mapsengine-api-java-wrapper-github/java/com/google/maps/clients/ApiErrorResponseJson.java
	lib/mapsengine-api-java-wrapper-github/java/com/google/maps/clients/BackOffWhenRateLimitedRequestInitializer.java
	lib/mapsengine-api-java-wrapper-github/java/com/google/maps/clients/HttpRequestInitializerPipeline.java
	lib/mapsengine-api-java-wrapper-github/java/com/google/maps/clients/RateLimitedBackOffRequired.java
	lib/mapsengine-api-java-wrapper-github/java/com/google/maps/clients/mapsengine/Security.java
	lib/mapsengine-api-java-wrapper-github/java/com/google/maps/clients/mapsengine/geojson/Geometry.java
	lib/mapsengine-api-java-wrapper-github/java/com/google/maps/clients/mapsengine/geojson/GeometryCollection.java
	lib/mapsengine-api-java-wrapper-github/java/com/google/maps/clients/mapsengine/geojson/LineString.java
	lib/mapsengine-api-java-wrapper-github/java/com/google/maps/clients/mapsengine/geojson/MultiLineString.java
	lib/mapsengine-api-java-wrapper-github/java/com/google/maps/clients/mapsengine/geojson/MultiPoint.java
	lib/mapsengine-api-java-wrapper-github/java/com/google/maps/clients/mapsengine/geojson/MultiPolygon.java
	lib/mapsengine-api-java-wrapper-github/java/com/google/maps/clients/mapsengine/geojson/Point.java
	lib/mapsengine-api-java-wrapper-github/java/com/google/maps/clients/mapsengine/geojson/Polygon.java
	lib/mapsengine-api-java-wrapper-github/javatests/com/google/maps/clients/HttpRequestInitializerPipelineTest.java
	lib/mapsengine-api-java-wrapper-github/javatests/com/google/maps/clients/RateLimitedBackOffRequiredTest.java
	lib/mapsengine-api-java-wrapper-github/javatests/com/google/maps/clients/mapsengine/SecurityTest.java
	lib/mapsengine-api-java-wrapper-github/javatests/com/google/maps/clients/mapsengine/geojson/GeometryCollectionTest.java
	lib/mapsengine-api-java-wrapper-github/javatests/com/google/maps/clients/mapsengine/geojson/LineStringTest.java
	lib/mapsengine-api-java-wrapper-github/javatests/com/google/maps/clients/mapsengine/geojson/MultiLineStringTest.java
	lib/mapsengine-api-java-wrapper-github/javatests/com/google/maps/clients/mapsengine/geojson/MultiPointTest.java
	lib/mapsengine-api-java-wrapper-github/javatests/com/google/maps/clients/mapsengine/geojson/MultiPolygonTest.java
	lib/mapsengine-api-java-wrapper-github/javatests/com/google/maps/clients/mapsengine/geojson/PointTest.java
	lib/mapsengine-api-java-wrapper-github/javatests/com/google/maps/clients/mapsengine/geojson/PolygonTest.java
	lib/mapsengine/LICENSE.txt
	lib/mapsengine/classpath-include
	lib/mapsengine/dependencies/APACHE-LICENSE.txt
	lib/mapsengine/dependencies/CDDL-LICENSE.txt
	lib/mapsengine/dependencies/css/maven-base.css
	lib/mapsengine/dependencies/css/maven-theme.css
	lib/mapsengine/dependencies/css/print.css
	lib/mapsengine/dependencies/css/site.css
	lib/mapsengine/dependencies/google-api-client-android-dependencies.html
	lib/mapsengine/dependencies/google-api-client-appengine-dependencies.html
	lib/mapsengine/dependencies/google-api-client-dependencies.html
	lib/mapsengine/dependencies/google-api-client-gson-dependencies.html
	lib/mapsengine/dependencies/google-api-client-jackson2-dependencies.html
	lib/mapsengine/dependencies/google-api-client-java6-dependencies.html
	lib/mapsengine/dependencies/google-api-client-servlet-dependencies.html
	lib/mapsengine/dependencies/google-http-client-android-dependencies.html
	lib/mapsengine/dependencies/google-http-client-appengine-dependencies.html
	lib/mapsengine/dependencies/google-http-client-dependencies.html
	lib/mapsengine/dependencies/google-http-client-gson-dependencies.html
	lib/mapsengine/dependencies/google-http-client-jackson2-dependencies.html
	lib/mapsengine/dependencies/google-http-client-jdo-dependencies.html
	lib/mapsengine/dependencies/google-oauth-client-appengine-dependencies.html
	lib/mapsengine/dependencies/google-oauth-client-dependencies.html
	lib/mapsengine/dependencies/google-oauth-client-java6-dependencies.html
	lib/mapsengine/dependencies/google-oauth-client-jetty-dependencies.html
	lib/mapsengine/dependencies/google-oauth-client-servlet-dependencies.html
	lib/mapsengine/dependencies/images/close.gif
	lib/mapsengine/dependencies/images/collapsed.gif
	lib/mapsengine/dependencies/images/expanded.gif
	lib/mapsengine/dependencies/images/external.png
	lib/mapsengine/dependencies/images/icon_error_sml.gif
	lib/mapsengine/dependencies/images/icon_info_sml.gif
	lib/mapsengine/dependencies/images/icon_success_sml.gif
	lib/mapsengine/dependencies/images/icon_warning_sml.gif
	lib/mapsengine/dependencies/images/logos/build-by-maven-black.png
	lib/mapsengine/dependencies/images/logos/build-by-maven-white.png
	lib/mapsengine/dependencies/images/logos/maven-feather.png
	lib/mapsengine/dependencies/images/newwindow.png
	lib/mapsengine/descriptor.json
	lib/mapsengine/google-api-services-mapsengine-v1-rev51-1.19.0-javadoc.jar
	lib/mapsengine/google-api-services-mapsengine-v1-rev51-1.19.0-sources.jar
	lib/mapsengine/google-api-services-mapsengine-v1-rev51-1.19.0.jar
	lib/mapsengine/google-api-services-mapsengine-v1-rev51-1.19.0.jar.properties
	lib/mapsengine/libs-sources/commons-logging-1.1.1-sources.jar
	lib/mapsengine/libs-sources/google-api-client-1.19.0-sources.jar
	lib/mapsengine/libs-sources/google-api-client-android-1.19.0-sources.jar
	lib/mapsengine/libs-sources/google-api-client-appengine-1.19.0-sources.jar
	lib/mapsengine/libs-sources/google-api-client-gson-1.19.0-sources.jar
	lib/mapsengine/libs-sources/google-api-client-jackson2-1.19.0-sources.jar
	lib/mapsengine/libs-sources/google-api-client-java6-1.19.0-sources.jar
	lib/mapsengine/libs-sources/google-api-client-servlet-1.19.0-sources.jar
	lib/mapsengine/libs-sources/google-http-client-1.19.0-sources.jar
	lib/mapsengine/libs-sources/google-http-client-android-1.19.0-sources.jar
	lib/mapsengine/libs-sources/google-http-client-appengine-1.19.0-sources.jar
	lib/mapsengine/libs-sources/google-http-client-gson-1.19.0-sources.jar
	lib/mapsengine/libs-sources/google-http-client-jackson2-1.19.0-sources.jar
	lib/mapsengine/libs-sources/google-http-client-jdo-1.19.0-sources.jar
	lib/mapsengine/libs-sources/google-oauth-client-1.19.0-sources.jar
	lib/mapsengine/libs-sources/google-oauth-client-appengine-1.19.0-sources.jar
	lib/mapsengine/libs-sources/google-oauth-client-java6-1.19.0-sources.jar
	lib/mapsengine/libs-sources/google-oauth-client-jetty-1.19.0-sources.jar
	lib/mapsengine/libs-sources/google-oauth-client-servlet-1.19.0-sources.jar
	lib/mapsengine/libs-sources/gson-2.1-sources.jar
	lib/mapsengine/libs-sources/httpclient-4.0.1-sources.jar
	lib/mapsengine/libs-sources/httpcore-4.0.1-sources.jar
	lib/mapsengine/libs-sources/jackson-core-2.1.3-sources.jar
	lib/mapsengine/libs-sources/jdo2-api-2.3-eb-sources.jar
	lib/mapsengine/libs-sources/jetty-6.1.26-sources.jar
	lib/mapsengine/libs-sources/jetty-util-6.1.26-sources.jar
	lib/mapsengine/libs-sources/transaction-api-1.1-sources.jar
	lib/mapsengine/libs/commons-logging-1.1.1.jar
	lib/mapsengine/libs/google-api-client-1.19.0.jar
	lib/mapsengine/libs/google-api-client-1.19.0.jar.properties
	lib/mapsengine/libs/google-api-client-android-1.19.0.jar
	lib/mapsengine/libs/google-api-client-android-1.19.0.jar.properties
	lib/mapsengine/libs/google-api-client-appengine-1.19.0.jar
	lib/mapsengine/libs/google-api-client-gson-1.19.0.jar
	lib/mapsengine/libs/google-api-client-jackson2-1.19.0.jar
	lib/mapsengine/libs/google-api-client-java6-1.19.0.jar
	lib/mapsengine/libs/google-api-client-servlet-1.19.0.jar
	lib/mapsengine/libs/google-http-client-1.19.0.jar
	lib/mapsengine/libs/google-http-client-1.19.0.jar.properties
	lib/mapsengine/libs/google-http-client-android-1.19.0.jar
	lib/mapsengine/libs/google-http-client-android-1.19.0.jar.properties
	lib/mapsengine/libs/google-http-client-appengine-1.19.0.jar
	lib/mapsengine/libs/google-http-client-gson-1.19.0.jar
	lib/mapsengine/libs/google-http-client-gson-1.19.0.jar.properties
	lib/mapsengine/libs/google-http-client-jackson2-1.19.0.jar
	lib/mapsengine/libs/google-http-client-jackson2-1.19.0.jar.properties
	lib/mapsengine/libs/google-http-client-jdo-1.19.0.jar
	lib/mapsengine/libs/google-http-client-jdo-1.19.0.jar.properties
	lib/mapsengine/libs/google-oauth-client-1.19.0.jar
	lib/mapsengine/libs/google-oauth-client-1.19.0.jar.properties
	lib/mapsengine/libs/google-oauth-client-appengine-1.19.0.jar
	lib/mapsengine/libs/google-oauth-client-java6-1.19.0.jar
	lib/mapsengine/libs/google-oauth-client-jetty-1.19.0.jar
	lib/mapsengine/libs/google-oauth-client-servlet-1.19.0.jar
	lib/mapsengine/libs/gson-2.1.jar
	lib/mapsengine/libs/gson-2.1.jar.properties
	lib/mapsengine/libs/httpclient-4.0.1.jar
	lib/mapsengine/libs/httpcore-4.0.1.jar
	lib/mapsengine/libs/jackson-core-2.1.3.jar
	lib/mapsengine/libs/jackson-core-2.1.3.jar.properties
	lib/mapsengine/libs/jdo2-api-2.3-eb.jar
	lib/mapsengine/libs/jetty-6.1.26.jar
	lib/mapsengine/libs/jetty-util-6.1.26.jar
	lib/mapsengine/libs/jsr305-1.3.9.jar
	lib/mapsengine/libs/transaction-api-1.1.jar
	lib/mapsengine/proguard-google-api-client.txt
	lib/mapsengine/readme.html
	src/api_key.txt
	src/app/SNSHelper.java
	src/app/SNSMessage.java
	src/app/TranscoderSNSServlet.java
	src/app/Tweet.java
	src/app/TweetGet.java
	src/app/TwitterDAO.java
	src/app/db_Tweets.java