sync for sync
Merge branch 'master' of https://github.com/amaliujia/StoneDB

Conflicts:
	Makefile.am
	fileOp/hwmap.cpp