Bugfix: ODFOREA-514
Merge branch 'OD6' of https://github.com/ObeoNetwork/TOGAF-Designer into OD6