some edit
Merge branch 'master' of https://github.com/384401056/MyUIDemo

Conflicts:
	.idea/misc.xml