Merge branch 'master' of https://github.com/PJKerrigan/Guts

Conflicts:
	private/library/guts3/renderers/compositetemplate.php
	private/library/guts3/renderers/icontainer.php
	private/library/guts3/renderers/itemplate.php