added Website solution
Merge branch 'master' into TS0.9