Merge branch 'master' of https://github.com/Pallevante/Iris into gustava

Conflicts:
	Iris/Iris.vcxproj
	Iris/Iris.vcxproj.filters
Merge branch 'gustava' of https://github.com/Pallevante/Iris into gustava