fixes in ifdef of virtual sites and ifdef in ibm.cpp
Merge branch 'master' of https://github.com/mohamed-abdelkhalek/espresso

Conflicts:
	src/core/forces_inline.hpp