add user observer
Merging
Merge branch 'develop' of github.com:fairnopoly/fairnopoly into develop
Solve small merge mistake