PSR applied. URI routing improved. Content 404 cache fix.
Content 404 cache fix 2.
Merge branch 'feature' into dev