Merge branch 'master' of git://github.com/yusuke/twitter4j

Conflicts:
	twitter4j-appengine/src/main/java/twitter4j/internal/json/LazyRateLimitStatus.java
	twitter4j-appengine/src/main/java/twitter4j/internal/json/LazyStatus.java
	twitter4j-async/src/test/java/twitter4j/AsyncTwitterTest.java
	twitter4j-core/src/main/java/twitter4j/Annotation.java
	twitter4j-core/src/main/java/twitter4j/StatusUpdate.java
	twitter4j-core/src/main/java/twitter4j/Tweet.java
	twitter4j-core/src/main/java/twitter4j/TwitterImpl.java
	twitter4j-core/src/main/java/twitter4j/internal/json/QueryResultJSONImpl.java
	twitter4j-core/src/main/java/twitter4j/internal/json/StatusJSONImpl.java
	twitter4j-core/src/main/java/twitter4j/internal/json/TweetJSONImpl.java
	twitter4j-stream/src/test/java/twitter4j/UserStreamTest.java
	twitter4j-stream/src/test/java/twitter4j/internal/json/DAOTest.java
Merge branch 'master' of git://github.com/yusuke/twitter4j

Conflicts:
	twitter4j-httpclient-support/src/main/java/twitter4j/internal/http/alternative/ApacheHttpClientHttpResponseImpl.java
TFJ-752 added parameter include_my_retweet to call API "GET statuses/show/:id"
Merge pull request #85 from haushinka2dx/TFJ-752

TFJ-752 set include_my_retweet when using showStatus()
Using API1.1 verify credentials URL when upload image to Lockerz.
Merge pull request #90 from s17er/lockerz-api1.1

TFJ-757 Use API1.1 verify credentials URL when upload image to Lockerz.
Merge branch 'master' of git://github.com/yusuke/twitter4j

Conflicts:
	twitter4j-core/src/main/java/twitter4j/internal/org/json/CookieList.java
	twitter4j-core/src/main/java/twitter4j/internal/org/json/HTTP.java
	twitter4j-core/src/main/java/twitter4j/internal/org/json/JSONML.java
	twitter4j-core/src/main/java/twitter4j/internal/org/json/JSONObject.java
	twitter4j-core/src/main/java/twitter4j/internal/org/json/XML.java
	twitter4j-core/src/main/java/twitter4j/internal/org/json/XMLTokener.java
	twitter4j-core/src/test/java/twitter4j/internal/org/json/Test.java
	twitter4j-stream/src/test/java/twitter4j/SiteStreamsTest.java
Merge branch 'master' of github.com:Mocel/twitter4j