Merge branch 'master' of https://github.com/hmenke/espresso
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Fix for missing EK species initialization in case EK_BOUNDARIES is switched on but no boundaries are present.
Small fix to the users guide.
fix to make the tcl command integrate less dependent on the status whether auto-updates of observebles or correlations is enabled or not
Merge branch 'master' of git://github.com/dschwoerer/espresso
Merge remote-tracking branch 'upstream/master'
Merge pull request #163 from rempferg/ek_fix

EK species initialization didn't happen when EK_BOUNDARIES was on but no boundaries set
Moved cudaStreamCreate from lbgpu_cuda.cu to cuda_init_cuda.cu and made sure old stream is destroyed upon device switch.
Merge branch 'cuda_stream_cleanup' of git://github.com/rempferg/espresso
Fixed Lattice class.
fixed drawing the cylinder
Merge branch 'obs' FML^2

Conflicts:
	scripts/auxiliary.tcl
	src/core/particle_data.cpp
	src/core/statistics_observable.cpp
	src/statistics_observable.hpp
Merge branch 'master' of github.com:richter-t/espresso FML^3

Conflicts:
	src/core/particle_data.cpp
	src/core/statistics_observable.cpp