manager.js
if 语句
fdsfds
ffffff
polish
Merge branch 'dev'

Conflicts:
	backendmanager/www/js/manager.js