initial version
Merge branch 'master' of https://github.com/entc/entc-base

Conflicts:
	CMakeLists.txt