Migration to vs2013
cleanup
ignore
Merge remote-tracking branch 'origin/feature/vs2013_migration' into feature/editor
Fix build