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

Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
update colvars from git repo to version 2014-11-06
update colvars example outputs