Merge sprint_diana into develop
beta-3052: ability to show tips relating to the vault the user is in: connectionId is now stored with the notification. When 0 = own vault, when !=0 it contains the id of the other connections' vault.
beta-3052: ability to show tips relating to the vault the user is in: connectionId is now stored with the notification. When 0 = own vault, when !=0 it contains the id of the other connections' vault.