Merge remote-tracking branch 'origin/react' into react

# Conflicts:
#	frontend/app/js/views/Auth/CustomInput.jsx