update
Merge branch 'develop'

Conflicts:
	src/alg_c/BTree.h