Merge branch 'wip' into dev

diff --cc README.rst
index 9415419edf585da773333c00f51b3f91a0ce5f8f,25c6888d9a69d1f0114e63bed4ec10d56a9462a3..2cc072ae3f6d940ad8ebba6f7802d5fb5d4d5cb5
--- 1/README.rst
--- 2/README.rst
+++ b/README.rst
@@@ -59,7 -59,7 +59,7 @@@ If the app is broken after a restore sc
      docker-compose restart
  
  
- Work with gulp
 -Installing gulp dependencies
++Installing dependencies
  ==================
  
  Gulp allow to compile scss to css, concatenate js files and has a watcher, who do this tasks on file change.
@@@ -67,17 -67,30 +67,32 @@@ Gulp require nodejs installed on your c
  
  1. Install gulp globally:
  
-     sudo npm install --global gulp
 -  If you have previously installed a version of gulp globally, please run `npm rm --global gulp`
 -  to make sure your old version doesn't collide with gulp-cli::
++    sudo npm install --g gulp
  
 -    npm install --global gulp
 +2. Install bower globally:
  
 -2. Install gulp dependencies::
 +    sudo npm install -g bower
 +
- 3. Install gulp dependancies::
++3. Install gulp dependencies::
  
      npm install
  
- 4. Install bower components::
 -3. Install ruby dependencies::
++4. Install ruby dependencies::
+ 
+     gem install bundler
+     bundle install
+ 
++
+ Compile static files
+ ==================
+ 
+ Static files are not included in Git. You need to compile them locally.
+ 
+ 1. Installing gulp dependencies::
+ 
+   See previous section.
+ 
+ 2. Fetching Bower components::
  
      bower install