Merge remote branch 'upstream/master'
reverted configure.ac
ghmc thermostat - v1 - still in testing
added ghmc files that were missing from the v1 commit
added experimental temperaure scaling option + some clean up
added ghmc parallelization
Merge branch 'master' of https://github.com/espressomd/espresso into ghmc

* 'master' of https://github.com/espressomd/espresso:
  Fixes to verstion build.
  genversion better posix compatibility
  fixed p3m maximal r_cut for parallel simulations
  Two execs in one sh-file does not make sense.
  Don't force installation of missing files.
  bootstrap.sh forces reconfiguration.
  Version is compiled into documentation.
  small fixes to the GPU LB
  Rearranged analysis chapter.
  UG documentation for FCS autocorrelation function
  git as suffix, not as prefix.
  More version handling.
  Updated version handling.
  Updated NEWS.
  Version handling for dist package.
  Fixed a bug in correlation init
  cmpile git-version into binary.
  First implementation of fcs autocorrelation function.
  Small fixes.
  My first try of git-version.
more efficient energy calculation after momentum update
Merge branch 'master' of https://github.com/espressomd/espresso into ghmc

* 'master' of https://github.com/espressomd/espresso:
  Added wiki design stuff.
Updated copyright header, added feature to definiton file.
fixed bug when using rotational inertia
Merge branch 'ghmc' of git://github.com/samins/espresso into ghmc
Merge pull request #1 from olenz/ghmc

Ghmc
added gibbs ensemble with ghmc script
Merge branch 'master' of github.com:espressomd/espresso
gibbs ensemble sample script + some small fixes to gibbs_ghmc
Merge branch 'master' of https://github.com/espressomd/espresso into ghmc

* 'master' of https://github.com/espressomd/espresso:
  Docs of more observables, removed some confusing ones
  Fixed a memory leak for LB GPU in lb.c
  First version of restructuring the analysis-core
  Re-structured the docs for analysis-core. Still a lot to be done.
  More robust version handling.
  added missing fix 1 1 1 to dielectric pore
  added particle_forces observable
  added ICC* documentation
  Suppress output of python test.
  Test for python -B (doesn't work with python 2.4)
  more on ELC
  Bugfix: avoid counting of self-interaction in the interaction observable
Merge pull request #13 from samins/ghmc

ghmc updates
Merge branch 'ghmc' of github.com:olenz/espresso
Merge branch 'master' into ghmc