Merge branch 'master' of https://github.com/wzxjohn/moeSS

Conflicts:
	application/controllers/Admin.php
	application/controllers/User.php
	application/models/Admin_model.php

Modify README.md

Merge pull request wzxjohn#18 from wzxjohn/dev

Add email check function