Special analysis for layered systems and attempts at dielectric constants
Merge branch 'master' of git://git.savannah.nongnu.org/espressomd into LJ_between_walls
Merge branch 'master' of git://git.savannah.nongnu.org/espressomd into LJ_between_walls

Conflicts:
	statistics.c
Merge branch 'master' of git://git.savannah.nongnu.org/espressomd into LJ_between_walls
Merge branch 'master' of github.com:arnolda/espresso into LJ_between_walls
new dir structure
new directory structure
Merge from Nadya
Merge branch 'master' of git://git.savannah.nongnu.org/espressomd into LJ_between_walls
Merge branch 'master' of git://github.com/espressomd/espresso
Merge branch 'master' of git://github.com/espressomd/espresso
Merge branch 'master' of git://github.com/espressomd/espresso
fixed FFT to use fftw_malloc for alignment
Merge branch 'master' of git://github.com/espressomd/espresso
Merge branch '3.0' of github.com:espressomd/espresso
Merge branch 'master' of git://github.com/espressomd/espresso
Merge branch 'master' of github.com:arnolda/espresso_layer_extensions
Merge branch 'master' of git://git.savannah.nongnu.org/espressomd
Merge branch 'master' of git://github.com/espressomd/espresso
Merge remote branch 'upstream/master'