Resolved Conflicts: doc/Manual.txt src/RIGID/fix_shake.cpp src/variable.cpp src/write_data.cpp
clenqueuemarker..