Merge branch 'master' into dev

# Conflicts:
#	luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/advanced.lua
#	luci-app-ssr-plus/root/etc/config/shadowsocksr
#	luci-app-ssr-plus/root/etc/init.d/shadowsocksr
#	luci-app-ssr-plus/root/etc/uci-defaults/luci-ssr-plus
#	luci-app-ssr-plus/root/usr/share/shadowsocksr/update.lua