error page
url back to library
Merge branch 'common/dev'

* common/dev:
  url back to library
  error page

updates