Merge branch 'github/fixes_for_Beta_V1Point1'
Addression gustavo comment on 2a0235775dfadda751ae867f74dcf503810eb20e
Prototype / ExtJS / jQuery are having a party. Colision in every direction. This is simply a non elegant patch.
Merge branch 'gitlab/f.guitton'