Merge remote-tracking branch 'origin/IE_test' into dev/new1

# Conflicts:
#	src/components/NumberDrop/index.jsx
#	src/utils/config.js