More context and template additions
Merge branch 'master' into template

Conflicts:
	src/memberdef.cpp
	src/memberdef.h