Prepared merge to master
Re-included VS-project files for hax branch