Change controller, model, and view names to avoid merge conflicts when pulling latest changes and remove some extaneous samples. Also create separate json and xml files for the new page controllers with sample content
Update core submodule