Fix: bad setup entry page
Fix: [ bug #622 ] attaching wrong file when sending the invoice via
e-mail
Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3
Updated change log
Merge pull request #580 from marcosgdf/3.3

Updated change log
Look: Minor fix in themes
Fix: Error using static method
Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3
Fix: Missing picto
Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3
Fix: Bad selection of option
Merge remote-tracking branch 'origin/3.3' into develop

Conflicts:
	htdocs/.gitignore