Merge branch 'master' into eduard
Pagination fix.
Fixed getRandomSurferList() Method.

Caused testing to not work.
Merge branch 'eduard-2'