stuff
Merge branch 'master' of https://github.com/Xander89/master_thesis

Conflicts:
	master/TranslucentMaterials.pro.user
	master/shaders/TranslucentMaterials/ss_cubemap_combination.vert