temporarily disable known to be broken pair style
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12635 f3b2605a-c512-4ea7-a41b-209d697bcdaa
Tweaked attributions

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12636 f3b2605a-c512-4ea7-a41b-209d697bcdaa
update colvars library to the state of 16 Oct 2014
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms

Resolved Conflicts:
	src/USER-OMP/pair_nb3b_harmonic_omp.h