Fixed bugs with url encoding and illegaly showing ACL's on collections
directory.php in template
Merge remote branch 'origin/0.9' into laura

Conflicts:
	src/directory.php