no message
Merge branch 'master' of https://github.com/swarly/TwiterKnowlageCenter-236700

Conflicts:
	src/main/java/ac/il/technion/twc/DataHandlerByJSON.java
no message
Merge branch 'master' of https://github.com/swarly/TwiterKnowlageCenter-236700

Conflicts:
	src/test/java/ac/il/technion/twc/LogicTests.java
no message