merge
Merge branch 'gh-pages' of https://github.com/dcloudio/mui into gh-pages

Conflicts:
	javascript/index.html
	sitemap.xml