error_page accepts relative path. recognizes phtml and inc extensions
Merge branch 'feature-display' into fork-master
Merge branch 'fork-master'
JSMin in it's own file
injection, jquery, css and js in their own files