BES 2014.02.11 GSHMC-UMBRELLA, second approach.
Merge branch 'master' of https://github.com/bescribano/GSHMC
BES 2014.02.11 merge github and arina before push

Conflicts:
	GSHMC_Brief.doc
	include/types/inputrec.h
	src/gmxlib/tpxio.c
	src/kernel/md.c
	src/mdlib/gshmc.c
	src/mdlib/gshmc.h