Signed-off-by: shanhu <sunhoo.bjtu@163.com>
Merge branch 'master' of https://github.com/shanhu/pims

Conflicts:
	_eric5project/pims.e4q
	_eric5project/pims.e4t
	system/admin.py

Signed-off-by: shanhu <sunhoo.bjtu@163.com>
Signed-off-by: shanhu <sunhoo.bjtu@163.com>
Merge branch 'master' of https://github.com/shanhu/pims

Conflicts:
	_eric5project/pims.e4q
	_eric5project/pims.e4t

Signed-off-by: shanhu <sunhoo.bjtu@163.com>
Signed-off-by: shanhu <sunhoo.bjtu@163.com>
Merge branch 'master' of https://github.com/shanhu/pims

Conflicts:
	_eric5project/pims.e4q
	_eric5project/pims.e4t
	system/models.py

Signed-off-by: shanhu <sunhoo.bjtu@163.com>