Include directories update
Merge branch 'master' of https://github.com/stijn22/Ivy

Conflicts:
	Project Ivy/IDE/IVY_ide.vcxproj