Merge branch 'hotfix/fixBoostFlagForWindows'
Fix SConscript and add a comment
Merge branch 'hotfix/fixSconscript' into develop

Conflicts:
	SConscript