Merge origin/master

Conflicts:
	src/GUIs/Central_Frame.java
Merge origin/master

Conflicts:
	src/GUIs/Central_Frame.java