Conversion to SQL Server
Merge branch 'master' of github.com:sheeand-detailwindow/master into local