update
Merge branch 'develop' of https://github.com/STUKA-TEAM/ZhongheWeiHelperR2 into develop

Conflicts:
	src/controller/store/EloveController.java
Merge branch 'develop' of https://github.com/STUKA-TEAM/ZhongheWeiHelperR2 into develop
update
Merge branch 'develop' of https://github.com/STUKA-TEAM/ZhongheWeiHelperR2 into develop