Comment out sort with blacklight helper until sort bug is fixed
Merge branch 'development' into staging