add submit survey function
fix conflict
fix conflict
Merge remote-tracking branch 'origin/master' into herbert/backend-integration
fix conflict
Merge remote-tracking branch 'origin/master' into herbert/backend-integration
Merge pull request #12 from charleschu/Jack/AddAreaQuestion

READY: move area delegate
Merge remote-tracking branch 'origin/master' into herbert/backend-integration
back end integration
input or textarea in open question
Merge pull request #13 from charleschu/Allen/2013-03-11

READY:input or textarea in open question
Merge remote-tracking branch 'origin/master' into herbert/backend-integration
Merge pull request #15 from charleschu/herbert/backend-integration

Herbert/backend integration
text change
fix messy code
Merge branch 'master' into Jack/AddAreaQuestion

Conflicts:
	js/controller/question.preview.js