CSS 兼容改善
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/views/user/login.php
	application/views/user/register.php
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/views/user/login.php
	application/views/user/register.php
	resources/css/main.css
CSS 兼容改善