Authors comments
directory class bug fixes and unit tests
cosmetic tidy of directory.php
cosmetic tidy of directory.php
Resolve conflicts
Merge branch 'master' of https://github.com/redaxmedia/redaxscript