merge自pudding，加上學術文章demo頁面與phppgadmin