fix bug
Merge branch 'master' of https://github.com/sunqichao/YZB

Conflicts:
	.DS_Store
add setting view