// Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap

Conflicts:
	.gitignore
	admin-dev/themes/default/css/admin.css
	admin-dev/themes/default/template/controllers/categories/helpers/list/list_header.tpl
	admin-dev/themes/default/template/controllers/customers/helpers/list/list_header.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/modules/page.tpl
	admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
	admin-dev/themes/default/template/controllers/orders/_documents.tpl
	admin-dev/themes/default/template/controllers/orders/_shipping.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/payment/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/payment/restrictions.tpl
	admin-dev/themes/default/template/controllers/products/images.tpl
	admin-dev/themes/default/template/controllers/products/informations.tpl
	admin-dev/themes/default/template/header.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/modules_list/list.tpl
	classes/Tools.php
	controllers/admin/AdminCartRulesController.php
	controllers/admin/AdminProductsController.php
	css/admin.css

.gitignore

@@ -5,8 +5,18 @@
 .idea
 .svn
 .DS_Store
+.sass-cache
 robots.txt
 sitemap.xml
+cache/cachefs/*
+!cache/cachefs/index.php
+download/*
+!download/index.php
+upload/*
+!upload/index.php
+admin-dev/autoupgrade/*
+admin-dev/backups/*
+!admin-dev/backups/index.php
 cache/smarty/cache/*
 !cache/smarty/cache/index.php
 cache/smarty/compile/*
@@ -16,6 +26,7 @@ cache/tcpdf/*
 !cache/tcpdf/index.php
 config/xml/*.xml
 config/settings.inc.php
+config/settings.old.php
 log/*.log
 img/*
 !img/index.php
@@ -27,6 +38,10 @@ tools/smarty*/compile/*.php
 override/classes/*.php
 themes/default/cache/*.js
 themes/default/cache/*.css
+themes/default/modules/*/*.php
+!themes/default/modules/*/index.php
+themes/default/lang/*.php
+!themes/default/lang/index.php
 modules/*/translations/*.php
 !modules/*/translations/index.php
 mails/*
@@ -35,4 +50,59 @@ modules/*/mails/*
 !modules/*/mails/en
 translations/*
 !translations/*.gzip
-.sass-cache
+modules/atos/*
+modules/addshoppers
+modules/alliedwallet
+modules/authorizeaim
+modules/autoupgrade
+modules/avalaratax
+modules/backwardcompatibility
+modules/canadapost
+modules/cloudcache
+modules/ebay
+modules/fedexcarrier
+modules/fianetfraud
+modules/fianetsceau
+modules/fidbag
+modules/firstdata
+modules/gadwords
+modules/gamification
+modules/ganalytics
+modules/gsitemap
+modules/hipay
+modules/iadvize
+modules/itembase
+modules/jirafe
+modules/kiala
+modules/kialasmall
+modules/klarnaprestashop
+modules/kwixo
+modules/livezilla
+modules/mailjet
+modules/merchantware
+modules/mobile_theme
+modules/mondialrelay
+modules/moneybookers
+modules/nqgatewayneteven
+modules/ogone
+modules/pagseguro
+modules/paypal
+modules/payulatam
+modules/prediggo
+modules/prestafraud
+modules/shipwire
+modules/shoppingfeedexport
+modules/shoppingfluxexport
+modules/socolissimo
+modules/stripejs
+modules/themeinstallator
+modules/tntcarrier
+modules/treepodia
+modules/trustedshops
+modules/trustly
+modules/twenga
+modules/upscarrier
+modules/uspscarrier
+modules/wexpay
+modules/yotpo
+modules/zingaya