fix conflict
fix conflict
fix conflict
fix sort of question
fix question edit
fix paging of front page
modify json for paging
Merge pull request #37 from charleschu/herbert/help-merge-css

READY: help merge css