Rename err404 to error
Add php notice
Rename modules to bundle
Merge branch 'dev'