modify implements of popup and controller.
Merge branch 'master' of github.com:tilfon/chrome_extensions