no message
Merge branch 'master' of https://github.com/fueltherage/CVR

Conflicts:
	UnityProjects/Voxel V1.1/Assets/Materials/BlackRim_Trans.mat
	UnityProjects/Voxel V1.1/Voxel V1.1-csharp.sln
	UnityProjects/Voxel V1.1/Voxel V1.1.sln