little
Merge branch 'develop' of https://github.com/STUKA-TEAM/resources into develop

Conflicts:
	src/controller/UploadImageController.java
修改 merge