unified licenses
attempting to fix windows bug
ready to merge
Merge branch 'dev-doc' into dev