temp commit.
Merge remote-tracking branch 'origin/master' into suyu_issue61
temp commit.
done.
Merge pull request #65 from cooee-zen/suyu_issue61

Suyu issue61: grid view and page view