Update csproj file with changes
Moved Forms and custom controls to subdirectory
Merge branch 'dev'