#351 enable sort by extra_vars
Merge branch 'develop' of https://github.com/xpressengine/xe-core into develop