updated the layout system to use /% when trying to match a url

also more work on custom fields
Merge branch 'master' of https://github.com/opencart/opencart