added namespace files
Merge branch 'namespace'

Conflicts:
	src/Makefile.am