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

Conflicts:
	src/test/java/ac/il/technion/twc/HashTagTest.java