Update responsiveness
Fix conflicts responsiveness
Merge branch 'master' of https://github.com/claudiucelfilip/treehuggers