update
Merge branch 'master' of https://github.com/swarly/TwiterKnowlageCenter-236700
Merge branch 'master' of https://github.com/swarly/TwiterKnowlageCenter-236700
bla
Merge branch 'master' of https://github.com/swarly/TwiterKnowlageCenter-236700

Conflicts:
	src/main/java/ac/il/technion/twc/impl/TwitterKnowledgeCenter.java
	src/main/java/ac/il/technion/twc/impl/tweet/ITweet.java
	src/main/java/ac/il/technion/twc/impl/tweet/LineStringTweet.java
	src/main/java/ac/il/technion/twc/impl/tweet/StringLineCompleteTweet.java
Api update