Merge origin/master

Conflicts:
	src/Database/DB_Manager.java
Merge origin/master

Conflicts:
	src/Database/DB_Manager.java
Merge origin/clone into clone

Conflicts:
	src/colortextile_form/Add_new_design.form
	src/colortextile_form/Add_new_design.java
Merge origin/clone into clone

Conflicts:
	src/colortextile_form/Add_new_design.form
	src/colortextile_form/Add_new_design.java
Merge origin/clone into clone

Conflicts:
	src/colortextile_form/Add_new_design.form
	src/colortextile_form/Add_new_design.java