some changes
Merge branch 'master' of https://github.com/yewlong/sdfs

Conflicts:
	sdfs-eclipse/src/sdfs/server.java
Merge branch 'master' of https://github.com/yewlong/sdfs