fix ajax pagination
Merge branch 'dev'
kill ajax/fix view
Merge branch 'dev'