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

Conflicts:
	about/index.html
	components/index.html
	dist/js/mui.js
	dist/js/mui.min.js
	getting-started-old/index.html
	getting-started/index.html
	index.html
	javascript-old/index.html
	javascript/index.html
	sitemap.xml