Merge remote-tracking branch 'origin/develop'
Merge remote-tracking branch 'origin/master' into develop
Merge branch 'develop'
Merge remote-tracking branch 'origin/develop'
Added locally used dir to .gitignore
merged develop into master
Added dictinaries/metadatafields.definition.json.org to .gitignore
Merge branch 'master' into feature/BACKLOG-976