Matrix, spaces and AND / OR refactoring
Fixes
Fix for missing trailing /
placeholder for folder
Rename Uri.php to URI.php
Fix for getResponse method
Merge branch 'development'