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

- change setLayout to forceLayout
Merge branch 'development'