Updated post some merge conflicts
Merge branch 'developcore' of https://github.com/DDReaper/MonoGame.git into developcore