architecture
Merge remote-tracking branch 'origin/develop'

Conflicts:
	src/constant/namespacestatus.h
	src/main/namespace.c