3 files changed, 14 insertions, 1 deletions

diff --git a/credits.html b/credits.html
index 1cc36c78..082eefd4 100644
--- a/credits.html
+++ b/credits.html
@@ -95,5 +95,14 @@
             <li>License: <a href="http://www.opensource.org/licenses/mit-license.php" target="_blank">http://www.opensource.org/licenses/mit-license.php</a></li>

         </ul>

     </div>

+

+    <div>

+        js-beautify

+        <ul>

+            <li>Written by Einar Lielmanis, <a href="mailto:einar@jsbeautifier.org">einar@jsbeautifier.org</a>. Python version flourished by <a href="http://github.com/satufk">Stefano Sanfilippo</a> with help from <a href="http://jason.diamond.name/weblog/">Jason&nbsp;Diamond</a>, Patrick&nbsp;Hof, Nochum&nbsp;Sossonko, Andreas&nbsp;Schneider, Dave&nbsp;Vasilevsky, <a href="http://my.opera.com/Vital/blog/">Vital&nbsp;Batmanov,</a> Ron&nbsp;Baldwin, Gabriel&nbsp;Harrison, <a href="http://shullian.com">Chris&nbsp;J.&nbsp;Shull</a>, <a href="http://mathiasbynens.be/">Mathias Bynens</a> and others.</li>

+            <li>Code from: <a href="https://github.com/einars/js-beautify" target="_blank">https://github.com/einars/js-beautify</a></li>

+            <li>License: <a href="https://github.com/einars/js-beautify/blob/master/license.txt" target="_blank">https://github.com/einars/js-beautify/blob/master/license.txt</a></li>

+        </ul>

+    </div>

         </body>

 </html>
\ No newline at end of file
diff --git a/js/document/html-document.js b/js/document/html-document.js
index 76436732..75628731 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -679,6 +679,8 @@ exports.HTMLDocument = Montage.create(TextDocument, {
             if(typeof this.application.ninja.selectedElements !== 'undefined'){
                 this.selectionModel = this.application.ninja.selectedElements;
             }
+
+            this.draw3DGrid = this.application.ninja.appModel.show3dGrid;
         }
     },
 
@@ -700,6 +702,8 @@ exports.HTMLDocument = Montage.create(TextDocument, {
                 this.application.ninja.stage._scrollLeft = this.savedTopScroll;
             }
             this.application.ninja.stage.handleScroll();
+
+            this.application.ninja.appModel.show3dGrid = this.draw3DGrid;
         }
     }
         ////////////////////////////////////////////////////////////////////
diff --git a/js/mediators/keyboard-mediator.js b/js/mediators/keyboard-mediator.js
index 443a18ac..62b514ee 100755
--- a/js/mediators/keyboard-mediator.js
+++ b/js/mediators/keyboard-mediator.js
@@ -170,7 +170,7 @@ exports.KeyboardMediator = Montage.create(Component, {
                 }
 
                 // Zoom tool
-                if(evt.keyCode === Keyboard.Z ) {
+                if((evt.keyCode === Keyboard.Z) && !(evt.ctrlKey || evt.metaKey) && !evt.shiftKey) {//ctrl or shift key not press with Z
                     evt.preventDefault();
                     this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[15]});
                     return;