Merge branch 'origin/develop'
David - update of Bootstrap "hide" and other minor changes
David - update of 'hide'