Adding 2 templates and adding kill i.e. 8 support
Merge branch 'master' of https://github.com/inboundnow/cta

Conflicts:
	functions/functions.global.php