Merge pull request #22 from charleschu/Jack/AddAreaQuestion

Jack/add area question
update edit option function
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
Merge branch 'master' into Jack/AddAreaQuestion