Do not use trailing slash and script end tag
Merge branch 'develop' of git://github.com/babsgosgens/nooku-platform into babsgosgens-develop

Conflicts:
	library/template/filter/script.php
Merge branch 'babsgosgens-develop' into develop