Making the window which confirms the help to dissapear
Merge commit 'a2742b65a7f00de43ebff4d69b5458ea9dfa7dc7' into development/architecture
Merge remote-tracking branch 'origin/development/architecture' into
development/architecture

Conflicts:
	Incubator-main/src/net/amicity/common/core/ContextManager.java
	Incubator-main/src/net/amicity/common/core/NotificationDispatcher.java
Merge remote-tracking branch 'origin/development/architecture' into
development/architecture