changes to crm.wrapper and namespace change
Merge branch 'devel' of ssh://git@github.com/jlaake/marked.git into
devel

Conflicts:
	marked/NAMESPACE
added back namespace
add back namespace