update
Merge branch 'master' of https://github.com/rongself/xproject

Conflicts:
	.gitignore
	application/controllers/AccountController.php
	application/models/Forms/Login.php
	public/index.php