Remove generated new from repo and add to post-merge script
Annual Xmas Event
Have event and reward at the same time, fix some orum bugs