Merge branch 'next' of github.com:eleme/element-ui into next

# Conflicts:
#	src/index.js