Specified file name of toolbar extension.
Merge pull request #2472 from timgraham/extension_location

Specified file name of toolbar extension.
Fix js Style
Merge pull request #2473 from yakky/feature/fix_js_style

Fix js Style