[MERGE] forward port of branch saas-9 up to 1d81bb0

# Conflicts:
#	addons/account_extra_reports/i18n/ca.po
#	addons/account_extra_reports/i18n/fi.po
#	addons/account_extra_reports/i18n/pl.po
#	addons/account_extra_reports/i18n/te.po
#	addons/account_extra_reports/i18n/zh_CN.po
#	addons/account_full_reconcile/i18n/hu.po
#	addons/account_full_reconcile/i18n/pl.po
#	addons/crm/crm_lead_menu.xml
#	addons/crm_claim/i18n/es_PE.po
#	addons/crm_claim/i18n/hu.po
#	addons/crm_claim/i18n/ja.po
#	addons/crm_claim/i18n/pl.po
#	addons/delivery/views/delivery_view.xml
#	addons/product/product_view.xml
#	addons/project_timesheet/i18n/es_PE.po
#	addons/stock/stock_view.xml

8 files changed, 81 insertions, 7 deletions

diff --git a/doc/cla/individual/MariusVaisvila.md b/doc/cla/individual/MariusVaisvila.md
new file mode 100644
index 00000000000..c083b2cbe3d
--- /dev/null
+++ b/doc/cla/individual/MariusVaisvila.md
@@ -0,0 +1,11 @@
+Lithuania , 2016-06-08
+
+I hereby agree to the terms of the Odoo Individual Contributor License
+Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this
+declaration.
+
+Signed,
+
+Marius Vaišvila marius@vaisvila.net https://github.com/atocyo
diff --git a/doc/cla/individual/dvdhinesh.md b/doc/cla/individual/dvdhinesh.md
new file mode 100644
index 00000000000..e1b4946d0b4
--- /dev/null
+++ b/doc/cla/individual/dvdhinesh.md
@@ -0,0 +1,9 @@
+India, 2016-06-10
+
+I hereby agree to the terms of the Odoo Individual Contributor License Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this declaration.
+
+Signed,
+
+Dhinesh D dvdhinesh.mail@gmail.com  https://github.com/dvdhinesh
diff --git a/doc/cla/individual/jordanvrtanoski.md b/doc/cla/individual/jordanvrtanoski.md
new file mode 100644
index 00000000000..670933470a9
--- /dev/null
+++ b/doc/cla/individual/jordanvrtanoski.md
@@ -0,0 +1,11 @@
+UAE, 07 May 2016
+
+I hereby agree to the terms of the Odoo Individual Contributor License
+Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this
+declaration.
+
+Signed,
+
+Jordan Vrtanoski jordan.vrtanoski@gmail.com https://github.com/jordanvrtanoski
diff --git a/doc/cla/individual/kler.md b/doc/cla/individual/kler.md
new file mode 100644
index 00000000000..54b72a9ca23
--- /dev/null
+++ b/doc/cla/individual/kler.md
@@ -0,0 +1,12 @@
+Sweden, 2016-06-09
+
+I hereby agree to the terms of the Odoo Individual Contributor License
+Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this
+declaration.
+
+Signed,
+
+Patrik Lermon  patrik.lermon@gmail.com https://github.com/kler
+
diff --git a/doc/cla/individual/leblanc-simon.md b/doc/cla/individual/leblanc-simon.md
new file mode 100644
index 00000000000..2c701ee72d4
--- /dev/null
+++ b/doc/cla/individual/leblanc-simon.md
@@ -0,0 +1,11 @@
+France, 2016-04-24
+
+I hereby agree to the terms of the Odoo Individual Contributor License
+Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this
+declaration.
+
+Signed,
+
+Simon Leblanc contact@leblanc-simon.eu https://github.com/leblanc-simon
diff --git a/doc/cla/individual/sheltonfreddy.md b/doc/cla/individual/sheltonfreddy.md
new file mode 100644
index 00000000000..d333e90fb24
--- /dev/null
+++ b/doc/cla/individual/sheltonfreddy.md
@@ -0,0 +1,11 @@
+India, 2016/06/08
+
+I hereby agree to the terms of the Odoo Individual Contributor License
+Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this
+declaration.
+
+Signed,
+
+Shelton Freddy sheltonfreddy141@gmail.com https://github.com/sheltonfreddy141
diff --git a/doc/cla/individual/toanant.md b/doc/cla/individual/toanant.md
new file mode 100644
index 00000000000..22f382972a1
--- /dev/null
+++ b/doc/cla/individual/toanant.md
@@ -0,0 +1,9 @@
+India, 2016-06-14
+
+I hereby agree to the terms of the Odoo Individual Contributor License Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this declaration.
+
+Signed,
+
+Abhishek Kumar Singh abhishek4bhopati@gmail.com https://github.com/toanant
diff --git a/doc/setup/install.rst b/doc/setup/install.rst
index e74ce8345cc..139cc244701 100644
--- a/doc/setup/install.rst
+++ b/doc/setup/install.rst
@@ -174,7 +174,7 @@ Or ``dpkg`` (handles less dependencies automatically):
     # apt-get install postgresql -y
     # dpkg -i <path_to_installation_package> # this probably fails with missing dependencies
     # apt-get install -f # should install the missing dependencies
-    # pdkg -i <path_to_installation_package>
+    # dpkg -i <path_to_installation_package>
 
 
 This will install Odoo as a service, create the necessary PostgreSQL_ user
@@ -462,25 +462,25 @@ Source installation requires manually installing dependencies:
             $ apt-get install -y npm
             $ sudo ln -s /usr/bin/nodejs /usr/bin/node
 
-    Once npm is installed, use it to install less and less-plugin-clean-css:
+    Once npm is installed, use it to install less:
 
     .. code-block:: console
 
-        $ sudo npm install -g less less-plugin-clean-css
+        $ sudo npm install -g less
 
   - on OS X, install nodejs via your preferred package manager (homebrew_,
-    macports_) then install less and less-plugin-clean-css:
+    macports_) then install less:
 
     .. code-block:: console
 
-        $ sudo npm install -g less less-plugin-clean-css
+        $ sudo npm install -g less
 
   - on Windows, `install nodejs <http://nodejs.org/download/>`_, reboot (to
-    update the :envvar:`PATH`) and install less and less-plugin-clean-css:
+    update the :envvar:`PATH`) and install less:
 
     .. code-block:: ps1
 
-        C:\> npm install -g less less-plugin-clean-css
+        C:\> npm install -g less
 
 Running Odoo
 ------------