12.1
fulfill basic fuctions
Merge branch 'master' of https://github.com/zzt93/Hw-Client

Conflicts:
	src/main/java/businesslogic/GoodsListbl/GL_manager_repo_Impl.java
	src/main/java/presentation/GoosTypeui/ButtonPanel.java
	src/main/java/presentation/GoosTypeui/GoodsTypeDriver.java
	src/main/java/presentation/GoosTypeui/Gui.java
	src/main/java/presentation/GoosTypeui/LoggingPanel.java
	src/main/java/presentation/GoosTypeui/TreePanel.java
	src/main/java/presentation/RepoUI/GoodsTypePanel.java