ASetAP updated
Merge branch 'gamemodel' into client
transfer moving into gamemodelsystem