Add assets and load them in game
Use new map
Merge master