Fixed bug with diary tab scrollview
Merge remote-tracking branch 'github/master'