Merge branch 'master' into development
[BUGFIX] component/remux

- fix bug where e.g. android browser was not able to determine layout
Merge branch 'development'