wang
Merge branch 'master' of https://github.com/ONETWO34/yelin

Conflicts:
	admin/content.php