Merge pull request #869 from loiccouturier/master

Enhance variant editor and Fo product
[FIX #813] Hide stock thresholds if infinite stock is active.
Fix comments and code formatting.
Fix cross selling block.
Enhancements in product display in front office:
- add pictograms display
- in variant products fix selection of visuals
- some fixes on visuals display
Merge pull request #870 from intportg/dev

Product display (pictograms and visuals) + fixes
Update Elastica to run with elastic search 1.0. Fix product indexation