Project file fix
Merge branch 'TypeScript-1.0'