git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12638 f3b2605a-c512-4ea7-a41b-209d697bcdaa
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12639 f3b2605a-c512-4ea7-a41b-209d697bcdaa
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12640 f3b2605a-c512-4ea7-a41b-209d697bcdaa
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12641 f3b2605a-c512-4ea7-a41b-209d697bcdaa
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12642 f3b2605a-c512-4ea7-a41b-209d697bcdaa
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12643 f3b2605a-c512-4ea7-a41b-209d697bcdaa
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12644 f3b2605a-c512-4ea7-a41b-209d697bcdaa
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms

Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
	src/USER-CUDA/fix_set_force_cuda.h
	src/USER-CUDA/pair_lj_sdk_cuda.h
	src/USER-FEP/compute_fep.cpp
synchronize with the colvars git repo again
update colvars library to version 2014-10-23
gpu library updates from trung