Merge commit '39cff0c7ec5b8b3070652a45d567e3faad1b2373'

Conflicts:
	CMakeLists.txt
	Code/inc/ocl_device.h
	Code/inc/ocl_kernel.h
	Code/inc/utl_matrix.h
	Code/inc/utl_type.h
	Code/src/ocl_device.cpp
	Code/src/ocl_query.cpp
	Code/src/utl_type.cpp
	Tutorial/11.profile/profile.cpp
	Tutorial/Makefile
Merge branch 'master' of https://github.com/sims1253/Tombstone-swift

Conflicts:
	Code/src/utl_type.cpp
	Tutorial/11.profile/profile.cpp
	Tutorial/Makefile