changes for next patch, 2d disc options for spheres, fix external upgrade, bug fixes for fix ave/chunk for density calcs, Aidan doc page citation deconvolution

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13833 f3b2605a-c512-4ea7-a41b-209d697bcdaa