MOWEB-21-BUG
conflict
Merge branch 'master' of https://github.com/Timeron/Nexus

Conflicts:
	src/main/java/com/nexus/controller/multiObserver/MultiObserverAdmin.java