modified project file
Merge branch 'feature' into develop