Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/settings.js
#	src/views/system/profile/userProfile.vue