Merge branch 'master' into dev
Added user entity and repo
Added userId to incident
Mode change