Merge remote-tracking branch 'origin/master'

Conflicts:
	RestApi/.classpath
	RestApi/bin/.gitignore
	RestApi/bin/com/jdwb/twitterapi/HttpGetter.class
	RestApi/src/com/jdwb/twitterapi/HttpGetter.java