local change.
Merge branch 'master' of https://github.com/Cafeaulait/SampleCode

Conflicts:
	Twitter4j_sample/src/Streaming.java
	Twitter4j_sample/src/Timeline.java
Jackson JSON processor sample code.