Trying to fix some bugs
Merge branch 'master' into develop/cuda

Conflicts:
	cfd.sln
	cfd_cuda/CUDA_Routine.cu
	cfd_cuda/Visualization.cpp
	cfd_cuda/Visualization.h
	cfd_cuda/app.ico
	cfd_cuda/cfd_cuda.rc
	cfd_cuda/cfd_cuda.vcxproj
	cfd_cuda/resource.h
	cfd_smoke/app.ico
	cfd_smoke/cfd_kernel.cu
	cfd_smoke/cfd_smoke.rc
	cfd_smoke/cfd_smoke.vcxproj
	cfd_smoke/cfd_visual.cpp
	cfd_smoke/cfd_visual.h
	cfd_smoke/resource.h
	cfd_smoke3D/app.ico
	cfd_smoke3D/cfd_2DKernel.cu
	cfd_smoke3D/cfd_smoke3D.aps
	cfd_smoke3D/cfd_smoke3D.rc
	cfd_smoke3D/cfd_smoke3D.vcxproj
	cfd_smoke3D/cfd_smoke3D.vcxproj.filters
	cfd_smoke3D/resource.h
	cfd_smoke3D/visual_framework.cpp
	cfd_smoke3D/visual_framework.h
Still contains bugs