[MERGE] Sync with trunk, tries to solve conflicts. There are still some new images to convert into images in xml files.
[FIX] product: fixed file whose conflicts markers where still alive. Alive bzr diff
[MERGE] Due to some issues with the trunk being merged
in my branch, I merge the legacy website-al branch, in order to perform an fp-style
merge.

Revisions included :
10487 and 10498 from fme that are null (commit and revert)
10488 from xmo: [ADD] dialog for fontawesome glyph manipulation
[FIX] portal_crm: access rights merge error
[IMP] website: editor menus is displayed in function of users groups (event, blog...)
[IMP] snippets cleaned feature grid
[IMP] better images for library
[FIX] website_event: event.event.ticket access right
[FIX] website_sale: update price in payement when the user change the delivery method
[FIX] website: access for portal user
[FIX] website_sale: auto set or remove carrier in function of product (service or not)
[IMP] Better Snippets
[IMP] Allow logo in header
[IMP] CSS for logo
[IMP] size of logo
[IMP] CSS
[IMP] CSS logo
[IMP] Logo
[IMP] CSS logo
[IMP] CSS