ECS minor changes
Merge branch 'master' of https://github.com/figlesta/dsws13m3

Conflicts:
	ScalableStorageService/src/app_kvEcs/ServerNode.java