add error page
add favicon data [ci skip]
add favicon to error page [ci skip]
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/clientside/.a.build