fixed conflict .editorconfig

.editorconfig

@@ -9,3 +9,6 @@ insert_final_newline = true
 [*.{html,css,scss,js,json}]
 indent_style = space
 indent_size = 2
+
+[*.md]
+trim_trailing_whitespace = false

CONTRIBUTING.md

@@ -0,0 +1,7 @@
+## CONTRIBUTING
+
+- Fork it ( https://github.com/stisla/stisla/fork )
+- Create your feature branch (`git checkout -b my-new-feature`)
+- Commit your changes (`git commit -am 'Add some feature'`)
+- Push to the branch (`git push origin my-new-feature`)
+- Create a new Pull Request

README.md

@@ -1,21 +1,38 @@
-# Free Bootstrap Admin Template 
+# Stisla
 ![GitHub last commit](https://img.shields.io/github/last-commit/stisla/stisla.svg)
 [![GitHub issues](https://img.shields.io/github/issues/stisla/stisla.svg)](https://github.com/stisla/stisla/issues)
 ![GitHub repo size in bytes](https://img.shields.io/github/repo-size/badges/shields.svg)
-![License](https://img.shields.io/github/license/stisla/stisla.svg)
+[![License](https://img.shields.io/github/license/stisla/stisla.svg)](LICENSE)
 ![npm version](https://badge.fury.io/js/yarn.svg)
 
 Stisla is Free Bootstrap Admin Template and will help you to speed up your project, design your own dashboard UI and the users will love it.
 
-More info: https://getstisla.com
+[![Stisla Preview](https://camo.githubusercontent.com/2135e0f6544a7286a3412cdc3df32d47fc91b045/68747470733a2f2f692e6962622e636f2f3674646d6358302f323031382d31312d31312d31352d33352d676574737469736c612d636f6d2e706e67)](https://getstisla.com)
 
-![Stisla Preview](https://i.ibb.co/6tdmcX0/2018-11-11-15-35-getstisla-com.png)
 
-# Roadmap
-You can find the Stisla road map here: https://trello.com/b/M8TMnehE/stisla-roadmap
+## Quick start
 
-# Contributing
+Several quick start options are available:
+
+- [Download the latest release.](https://github.com/stisla/stisla/archive/v2.2.0.zip)
+- Clone the repo: `git clone https://github.com/stisla/stisla.git`
+- Install with [npm](https://www.npmjs.com)
+- Install with [yarn](https://yarnpkg.com)
+
+Read the [Getting started page](https://getstisla.com/docs) for information on the framework contents, templates and examples, and more.
+
+
+## Roadmap
+You can find the Stisla road map here: [Stisla Roadmap](https://trello.com/b/M8TMnehE/stisla-roadmap)
+
+
+## Integrates
+- [Rails](https://github.com/SunDi3yansyah/stisla-rails)
+
+
+## Contributing
 The contribution guide is still in progress :)
 
-# License
-Stisla is under the MIT license
+
+## License
+Stisla is under the [MIT License](LICENSE)

package.json

@@ -13,7 +13,7 @@
     "bootstrap-social": "^5.1.1",
     "bootstrap-tagsinput": "^0.7.1",
     "bootstrap-timepicker": "^0.5.2",
-    "chocolat": "^0.4.2.1",
+    "chocolat": "^0.4.21",
     "cleave.js": "^1.4.7",
     "codemirror": "^5.43.0",
     "datatables": "^1.10.18",