Security: adding get(Include)Template, cleanup

Resolves issue #1802
Merge branch 'master' of https://github.com/willmorgan/sapphire

Conflicts:
	security/Security.php