Fixing plugin specific constants
Merge branch 'master' of github.com:inboundnow/cta

Conflicts:
	shared/classes/class.templating-engine.php