Build bug fixes
Merge branch 'master' of https://github.com/Rhoana/Mojo

Conflicts:
	Mojo.2.0/Mojo/Mojo.Wpf/View/D3D11RenderingPaneHost.cs