Hot fix

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	css/child-theme.css
#	js/popper.js
#	package.json
#	style.css