markAsMine
Merge branch 'master' of https://github.com/toonya/yunhe

Conflicts:
	admin/css/admin.css