Error page code update
Merge code_update

Conflicts:
	modules/app/view/layouts/basic.phtml