代码优化
Merge branch 'master' of https://github.com/hpparker/rm

Conflicts:
	back.php