Fixed merge earlier merge mishaps (adding back in assets, server packages and data storage package)
Fixed bugs in Room and Game