update edit option function
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