Merge origin/How-Fei

Conflicts:
	src/main/java/main/MainGuiFrame.form
	src/main/java/main/MainGuiFrame.java
	src/main/resources/main/Bundle.properties
Resolved
Implement the code to fade more + further cleanup