Merge branch 'template'
pre merge
Merge branch 'master' of github.com:imagecms/ImageCMS
Merge branch 'master' into template

Conflicts:
	application/libraries/template.php
all syncronizations
Merge branch 'template' of github.com:imagecms/ImageCMS into template
Merge remote-tracking branch 'origin/template'