Merge branch 'document_paging'
change the default state of a template to "Pre-loaded" instead of "Uploaded" and have the counts on the document page reflect the state of the "Show Archived" flag
Merge branch 'document_paging' into testing