wyj
Merge branch 'master' of https://github.com/Demonsu/IMSIS

Conflicts:
	public/login.php

Signed-off-by: Ghostcandywyj <ghost.wyj@gmail.com>
wyj
wyj