update feedback
fix bug
Merge branch 'master' of https://github.com/earthlinkdesign/calypso