[*] BO Module search: Enter key is now disabled in quick search field
Merge branch 'development' of C:\wamp\www\prestashop_15 with conflicts.
Merge remote-tracking branch 'origin/development' into development