fixing build proj
Merge branch 'development' into qa