first implementation of the affinity
proper normalization
fixed order parameter fluctuation
Merging in process
merging ongoing
test for affinity added
manual updated
Merge branch 'master' of git://github.com/espressomd/espresso into shanchen
small fix to the sc_affinity_gpu.tcl test
finished ug additions
re-added missing .gz files from testsuite
removed old cuda_common.cu, that was re-added by the merge
fixed some #ifdefs
more #ifdefs fixed
Merge branch 'master' of git://github.com/espressomd/espresso into shanchen