Merge branch 'lammps_add_transport_velocity' into swimmer2d

Conflicts:
	examples/USER/sph/flow_around_cylinder/flow.lmp
	examples/USER/sph/flow_around_cylinder/vars.lmp
	src/USER-SPH/pair_sph_adami.cpp
Switch to to sin in the definition of the active bond
Merge branch 'swimmer2d' of github.com:/slitvinov/lammps-swimmer into swimmer2d

Conflicts:
	examples/USER/sph/flow_around_cylinder/vars.lmp