Jan 03 merge 1

[ShovelHand]

• Background service for charge promotion reinstated
• fixed issue with bad string formatting when new year rolls over
• other minor fixes