Updated sequence diagrams and and moved arround in load/save game
Fixed merge conflicts