Moving the class back
Reverting stuffs
Merge remote-tracking branch 'origin/master' into 1.7.2

Conflicts:
	src/main/java/com/dynious/refinedrelocation/gui/GuiModularTest.java
	src/main/java/com/dynious/refinedrelocation/gui/widget/GuiButtonSide.java
	src/main/java/com/dynious/refinedrelocation/gui/widget/GuiCheckboxFilter.java
	src/main/java/com/dynious/refinedrelocation/gui/widget/GuiTextInputUserFilter.java