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

Conflicts:
	src/tools/Constant.java
Merge branch 'develop' of https://github.com/STUKA-TEAM/resources into develop

Conflicts:
	src/tools/Constant.java