added back .project
Merge branch 'dev' into 74201810