Merge branch 'feature/Forms' into develop
Merge branch 'feature/Forms' into develop
Updating git attributes
Merge branch 'develop'