Fixed scrollspy issue
Merge remote-tracking branch 'origin/master' into feature/fill_content