admin init
Merge branch 'master' of https://github.com/libo2452/hantanqing

Conflicts:
	ci_admin/ci_admin/config/form_validation.php
	ci_admin/ci_admin/language/chinese/dx_auth_lang.php
	ci_admin/ci_admin/language/chinese/form_validation_lang.php
	ci_admin/ci_admin/views/auth/header.php
	ci_admin/ci_admin/views/auth/login_form.php
	ci_admin/public/js/main.js