Restore correct date
Fix: No hard coded data
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: 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
Merge remote-tracking branch 'origin/3.4' into 3.5

Conflicts:
	build/debian/changelog
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
Merge remote-tracking branch 'origin/3.4' into 3.5

Conflicts:
	ChangeLog
	htdocs/compta/stats/cabyprodserv.php
	htdocs/compta/stats/casoc.php
Fix: The scale was hardcoded.
Comment in english
Fix: A lot of bug into generation of sticker pages or address pages
form members module:
- Position of element was wrong for non A4 pages.
- Removed bugged definition of 5164 sticker template.
- Solve problem of image proportions.
- Margin of right was wrong.

Conflicts:
	htdocs/core/modules/member/doc/pdf_standard.class.php
	htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
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
Merge remote-tracking branch 'origin/3.4' into 3.5

Conflicts:
	htdocs/install/mysql/data/llx_c_tva.sql
Fix: Change to make debian package ok despite removal of ckeditor
package.
Update doc
Fix: Wrong prerequisite on PHP version
Update doc
Fix: typo