Fix the tests
Merge branch 'master' of https://github.com/ophirdj/Software-Design.git

Conflicts:
	twitter-knowledge-center/src/main/java/ac/il/technion/twc/api/core/ServiceBuildingManager.java