Add new pages of Lin and Pang
Merge branch 'dev' into prod