Add PageInfo class
Merge branch 'develop' into login