anpassning till ny datamodell.
Merge branch 'master' of https://github.com/jconsid/react-web