Fix conflict between Selectables and Orderables
Simplify selectors
Merge branch 'integration-2.4' of github.com:symphonycms/symphony-2 into integration-2.4