Added ability to turn off responsiveness
Merge branch 'develop' into gh-pages