first step in responsiveness
Merge branch 'develop'