[+] IN : added a new order state for unpaid out of stock (when you order by cheque/bankwire and there is no stock)
// small fix
Merge branch '1.6' of github.com:PrestaShop/PrestaShop into 1.6
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6

Conflicts:
	install-dev/upgrade/sql/1.6.0.11.sql
// add override js file for blockwishlist
git Merge branch '1.6' of github.com:PrestaShop/PrestaShop into 1.6
[+] BO: Set for each order status if invoice / delivery-slip should be added to email as pdf