1
Merge branch 'master' of https://github.com/shanhu/pims

Conflicts:
	_eric5project/pims.e4q
Signed-off-by: shanhu <shanhu.cn@gmail.com>
Signed-off-by: shanhu <shanhu.cn@gmail.com>