2-1, fixed infinite-scroll bug

Signed-off-by: Yoann SOLACROUP <solacroup.yoann@gmail.com>
Merge branch 'dev-2-1' into dev