Latest changes
failed merge
Cleanup of contributed modules. Updated basic page feature