Fix the logic to catch the first time association and correctly display the message in dialog
Modified various message in the dialogs
Merge branch 'feature/ConfluenceWiki' into develop

* feature/ConfluenceWiki:
  Modified various message in the dialogs
  Fix the logic to catch the first time association and correctly display the message in dialog