fix bug

fix bug when no area checkbox is checked
Merge branch 'master' into Jack/AddAreaQuestion
add edit area question

add edit area question using jquery.tmpl()
Merge pull request #22 from charleschu/Jack/AddAreaQuestion

Jack/add area question
fix bug

fix bug when no area checkbox is checked
add edit area question

add edit area question using jquery.tmpl()
add "max_num " and "min_num " in survey
add "areaType" in survey
add css style
Merge pull request #23 from charleschu/Allen/2013-03-12

READY:update edit option function
Merge remote-tracking branch 'origin/master' into vivian/add-style-031213
import survey json
Merge pull request #24 from charleschu/vivian/add-style-031213

Ready: add-style-031213
fix backend
fix conflict
Merge remote-tracking branch 'origin/vivian/add-style-031213' into herbert/backend-integration
update edit option function
add css style
import survey json
change question preview template

change question preview template, replace <ul><li>