Merge hub/Spring into Spring

Conflicts:
	src/main/java/com/controller/ProductController.java
	src/main/java/commons/Structure.java