jtong - add new layout for admin pages
jtong - move question tempalte to admin, and question template preview page
jtong - fix make color template
Merge branch 'master' into release