Implementing feature #7, added error-pages and error-handler
Merge branch 'feature-7' into develop