Windows: Fixed build issues (system header conflicts)
Merge branch 'ui-framework' of ssh://github.com/skyjake/Doomsday-Engine into ui-framework