Migration to vs2013
cleanup
ignore
Merge branch 'feature/vs2013_migration' into develop