finish acl prototype merge with filesystem; fix bugs.
Merge branch 'fileSystem' of github.com:xiangli-cmu/etcd into fileSystem
Merge branch 'acl' into fileSystem