admin　tpl修正 試し
Merge branch 'master' of https://github.com/tctcFresh/tmgyweb

Conflicts:
	www/fuel/app/views/admin/user.tpl