Merge

package.json

@@ -1,6 +1,7 @@
 {
   "name": "stackedit",
   "version": "3.1.5",
+  "private": true,
   "description": "StackEdit is a free, open-source Markdown editor based on PageDown, the Markdown library used by Stack Overflow and the other Stack Exchange sites.",
   "main": "res/main.js",
   "directories": {

public/cache.manifest

@@ -1,5 +1,5 @@
 CACHE MANIFEST
-#Date Wed Jan 22 2014 00:13:45
+#Date Sun Feb 02 2014 21:53:00
 
 CACHE:
 res/worker.js

public/res/WELCOME.md

@@ -63,7 +63,7 @@ You can import a document from the *Cloud* by going to the <i class="icon-provid
 
 You can export any document by going to the <i class="icon-provider-gdrive"></i> `Google Drive` or the <i class="icon-provider-dropbox"></i> `Dropbox` sub-menu and by clicking `Export to...`. Even if your document is already synchronized with **Google Drive** or **Dropbox**, you can export it to a another location. **StackEdit** can synchronize one document with multiple locations.
 
-> **Tip:** Using **Google Drive**, you can create collaborative documents to work in real time with multiple users on the same document. Just check the box `Create a real time collaborative document` in the dialog options when exporting to Google Drive.
+> **Tip:** Using **Google Drive**, you can create collaborative documents to work in real time with other users. Just check the box `Create a real time collaborative document` in the dialog options when exporting to Google Drive.
 
 #### <i class="icon-refresh"></i> Synchronize a document
 

public/res/extensions/twitter.js

@@ -1,12 +1,10 @@
-/*globals _gaq */
 define([
     "jquery",
     "underscore",
     "constants",
     "utils",
     "classes/Extension",
-    "settings",
+], function($, _, constants, utils, Extension) {
-], function($, _, constants, utils, Extension, settings) {
 
     var twitter = new Extension("twitter", "Twitter", false, true);
 

public/res/extensions/welcomeTour.js

@@ -109,7 +109,7 @@ define([
                 title: 'Happy StackWriting!',
                 content: [
                     '<p>Enjoy, and don\'t forget to rate <b>StackEdit</b> on <a target="_blank" href="https://chrome.google.com/webstore/detail/stackedit/iiooodelglhkcpgbajoejffhijaclcdg/reviews">Chrome Web Store</a>...</p>',
-                    '<a href="https://twitter.com/share" class="twitter-share-button" data-url="https://stackedit.io" data-text="StackEdit – markdown editor" data-via="stackedit" data-size="large"></a>',
+                    '<a href="https://twitter.com/share" class="twitter-share-button" data-url="https://stackedit.io" data-text="Great #markdown editor!" data-via="stackedit" data-size="large"></a>',
                 ].join(""),
                 placement: 'bottom',
                 onShown: function() {

public/res/html/dialogAbout.html

@@ -7,7 +7,7 @@
         </div>
         <div class="modal-body">
             <div class="pull-right">
-                <a href="https://twitter.com/share" class="twitter-share-button" data-url="https://stackedit.io" data-text="StackEdit – markdown editor" data-via="stackedit" data-size="large"></a>
+                <a href="https://twitter.com/share" class="twitter-share-button" data-url="https://stackedit.io" data-text="Great #markdown editor!" data-via="stackedit" data-size="large"></a>
             </div>
             <dl>
                 <dt>About:</dt>