task #007-Page_404_and_pagE_404: Features with pages added.
task #007-Page_404_and_pagE_404: DB image updated.
Conflict resolved
Conflict resolved
Merge branch '007-Page_404_and_pagE_404' into develop