Proper pagination for Trees list
Merge branch 'master' into simple-curation-app

Conflicts:
	curator/views/study/edit.html