open branch
Merge remote-tracking branch 'origin/conflictbranch1'

Conflicts:
	twitter-knowledge-center/src/main/java/ac/il/technion/twc/api/TKCBuilder.java
	twitter-knowledge-center/src/main/java/ac/il/technion/twc/impl/tasks/hashtag_popularity/HashtagPopularityFeatureModel.java
	twitter-knowledge-center/src/main/java/ac/il/technion/twc/impl/tasks/lifetime_of_tweets_task/TweetsLifetimeCacheIndex.java
	twitter-knowledge-center/src/main/java/ac/il/technion/twc/impl/tasks/lifetime_of_tweets_task/TweetsLifetimeFeatureModel.java
	twitter-knowledge-center/src/main/java/ac/il/technion/twc/impl/tasks/lifetime_of_tweets_task/TweetsLifetimeTaskModel.java