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


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


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


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


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


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


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


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


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


git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11064 f3b2605a-c512-4ea7-a41b-209d697bcdaa
sorting and buffering not allowed at the same time.
coul/wolf pair styles need to handle exclusions the same way with kspace
need to force all pairs into neighbor list for coul/dsf styles as well
disable single method in coul/wolf coul/dsf styles for now
Merge branch 'lammps-icms' of bitbucket.org:akohlmey/lammps-icms into lammps-icms
Merge remote branch 'lammps-ro/master' into lammps-icms

Resolved Conflicts:
	doc/Manual.txt
	src/USER-MISC/bond_harmonic_shift.cpp
	src/USER-MISC/bond_harmonic_shift_cut.cpp