Merge branch 'master' of https://github.com/thumaszz/ccore

Conflicts:
	src/core/types.h
Merge branch 'master' of https://github.com/thumaszz/ccore

Conflicts:
	src/core/types.h