Engine
Merge branch 'master' of https://github.com/D33D33/PixelSense

Conflicts:
	Aymeric/SurfaceAppTest/SurfaceAppTest.suo
	Aymeric/SurfaceAppTest/SurfaceAppTest/SurfaceAppTest/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Aymeric/SurfaceAppTest/SurfaceAppTest/SurfaceAppTestContent/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Merge branch 'master' of https://github.com/D33D33/PixelSense
Sprint1