Updated module versions
(cherry picked from commit e90c1d9)
Fixed signature for user view model. Closes #157
Merge branch 'master' into devel
Merge branch 'devel' into events