Merge branch 'panel-settings-button' of http://github.com/SAPlayer/brackets-git into SAPlayer-panel-settings-button

Conflicts:
	src/Panel.js

Author: zaggino

htmlContent/git-panel.html

@@ -48,7 +48,10 @@
                 <button title="{{TOOLTIP_PULL}}" class="btn small git-pull"><i class="octicon octicon-repo-pull"></i></button>
                 <button title="{{TOOLTIP_PUSH}}" class="btn small git-push"><i class="octicon octicon-repo-push"></i></button>
             </div>
-            <button title="{{TOOLTIP_OPEN_BASH}}" class="btn small git-bash"><i class="octicon octicon-terminal"></i></button>
+            <div class="btn-group">
+                <button title="{{TOOLTIP_OPEN_BASH}}" class="btn small git-bash"><i class="octicon octicon-terminal"></i></button>
+                <button title="{{GIT_SETTINGS}}" class="btn small git-settings"><i class="octicon octicon-settings"></i></button>
+            </div>
             <button title="{{TOOLTIP_BUG}}" class="btn small git-bug"><i class="octicon octicon-bug"></i></button>
         </div>
         <a href="#" class="close">&times;</a>

src/Panel.js

@@ -30,6 +30,7 @@ define(function (require, exports) {
         GitControl         = require("./GitControl"),
         Strings            = require("../strings"),
         Utils              = require("./Utils"),
+        SettingsDialog     = require("./SettingsDialog"),
         PANEL_COMMAND_ID   = "brackets-git.panel";
 
     var gitPanelTemplate            = require("text!htmlContent/git-panel.html"),
@@ -1304,6 +1305,7 @@ define(function (require, exports) {
             .on("click", ".change-remote", handleRemotePick)
             .on("click", ".remove-remote", handleRemoteRemove)
             .on("click", ".git-remote-new", handleRemoteCreation)
+            .on("click", ".git-settings", SettingsDialog.show)
             .on("contextmenu", "tr", function (e) {
                 var $this = $(this);
                 if ($this.hasClass("history-commit")) { return; }