Fix: avoid to include not desired directory
Fix: Removed analytics tags
Merge remote-tracking branch 'origin/3.3' into 3.4
More prerequisites to check to run makepack-dolibarr to build debian
package (check on dpatch too).
Fix: Update doc and packager for doliwamp

Conflicts:
	build/exe/doliwamp/doliwamp.iss

Conflicts:
	build/exe/doliwamp/doliwamp.iss
More prerequisites to check to run makepack-dolibarr to build debian
package (check on dpatch too).
Fix: Update doc and packager for doliwamp

Conflicts:
	build/exe/doliwamp/doliwamp.iss

Conflicts:
	build/exe/doliwamp/doliwamp.iss

Conflicts:
	build/exe/doliwamp/doliwamp.iss
Merge remote-tracking branch 'origin/3.3' into 3.4

Conflicts:
	ChangeLog
	build/debian/changelog
	build/exe/doliwamp/doliwamp.iss
	build/makepack-dolibarr.pl
	build/pad/pad_dolibarr.xml
	build/pad/pad_doliwamp.xml
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/filefunc.inc.php
Restore correct date
Fix: Call Image on this instead of pdf.
Fix: Missing parameter for photo.

Conflicts:
	htdocs/core/modules/member/doc/pdf_standard.class.php
	htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
Fix: doxygen
New standard VAT rate for France on january, 1st, 2014
Fix: Bad SQL request when using filter on category.
Update doc for 3.4.2
Problem of key of language into auguria menu
Merge pull request #1363 from atm-alexis/3.4

New standard VAT rate for France on january, 1st, 2014
Fix: Change to make debian package ok despite removal of ckeditor
package.
Update doc
Merge remote-tracking branch 'origin/3.3' into 3.4

Conflicts:
	ChangeLog
Fix: Bad get of localtaxes into contracts add lines