Added VS project
Merge branch 'development'