Merge remote-tracking branch 'refs/remotes/origin/master'
remove scrollToBottomAnimated

no one using this function any more
Merge branch 'hotfix'