Merge branch 'master' of E:\Work\TakeOne\TakeOne with conflicts.
Add SOIL library for windows