git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12626 f3b2605a-c512-4ea7-a41b-209d697bcdaa
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12627 f3b2605a-c512-4ea7-a41b-209d697bcdaa
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12628 f3b2605a-c512-4ea7-a41b-209d697bcdaa
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms

Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12630 f3b2605a-c512-4ea7-a41b-209d697bcdaa
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12631 f3b2605a-c512-4ea7-a41b-209d697bcdaa
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12632 f3b2605a-c512-4ea7-a41b-209d697bcdaa
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12633 f3b2605a-c512-4ea7-a41b-209d697bcdaa
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12634 f3b2605a-c512-4ea7-a41b-209d697bcdaa
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms

Resolved Conflicts:
	src/USER-FEP/fix_adapt_fep.cpp
avoid segfault when failing to open potential from LAMMPS_POTENTIALS
use rewind() instead of opening and closing the potential
we need to initialize "cutvalue" variable in hybrid pair styles
move custom makefiles to the designated directory MAKE/MINE
adjust labels and settings in custom makefiles
swap back makefiles that were accidentally swapped
remove warnings from fix qeq
update USER-FEP to the latest git repo version
remove additional code from mike brown that was in his bitbucket repo
do not call MPI_Abort() the GPU library, if MPI is already shut down
use global constant for sqrt(pi)