Saving updates for counters and bucket person speed.

[gloriadukuzeyesu]

Resolved the conflict. It was a minor conflict in main.cpp. Where the #include was missing the file name.