Mert ge tag '1.0.0.pre.2' into develop

Prerelease 2

* tag '1.0.0.pre.2':
add layout to errors page
fix line of code
Merge branch 'release/1.0.0.pre.3'

* release/1.0.0.pre.3:
  fix line of code
  add layout to errors page