Merge proposals dependent on lp:~tapaal-contributor/tapaal/load-and-save-time-and-game-net-properties

1. load-and-save-time-and-game-net-properties
2. Dependent merge proposals