little update.....
fix conflicts....

Conflicts:
	src/main/java/com/ctriposs/tsdb/table/MemTable.java
Merge branch 'master' of https://github.com/jinfei21/timesquencedb