增加注册Controller
merge static
merge static
Merge branch 'master' of https://github.com/mrhack/dipei

Conflicts:
	application/view_cache/07/a7/6e07cbae306a5e1db6210638afd3.php
	application/view_cache/1f/79/9ba9a1864e0d82808d924cd773a1.php
merge static
Merge branch 'master' of https://github.com/mrhack/dipei
Merge branch 'master' of https://github.com/mrhack/dipei
登陆/注册