Added getUserId to table of content
Merge branch 'develop'