为ajax做准备

小改变，未实现ajax
Merge remote-tracking branch 'origin/dev' into fion