Conflicts:
	htdocs/langs/en_US/errors.lang

Fix: wrong name

HTML 5 doctype

var to public

var to public

Replace var to public

Replace attributes var for public

Cleaning code

FIX: Setting supplier as client when accept a supplier proposal

FIX navigation field is always ref

GETPOST instead of $_GET

Fix: missing date locale and date rfc

Fix user right write margin

Conflicts:
	htdocs/core/class/CMailFile.class.php
	htdocs/langs/en_US/errors.lang

Conflicts:
	htdocs/product/class/product.class.php

Improve install header to use html 5 doctype

Improve code style

Update deprecated code style

Conflicts:
	htdocs/filefunc.inc.php
	htdocs/install/mysql/data/llx_c_payment_term.sql
	htdocs/langs/en_US/bills.lang
	htdocs/langs/en_US/mails.lang

Conflicts:
	htdocs/conf/conf.php.example
	htdocs/langs/en_US/mails.lang