Merge branch 'master' into component-slots

# Conflicts:
#	src/.vuepress/config.js

Author: ntepluhina

src/.vuepress/config.js

@@ -49,8 +49,12 @@ module.exports = {
           children: [
             'component-registration',
             'component-props',
+<<<<<<< HEAD
             'component-custom-events',
             'component-slots'
+=======
+            'component-custom-events'
+>>>>>>> master
           ]
         }
       ]