Updated to latest develop branch

Resolved build issue which were due to the content pipeline project using the modified Windows Project.  Content pipeline build also now uses the Core project.