add chagnes for the schema file
Merge branch 'master' of github.com:ProjectPro/projectpal
remove conflicts