Small post-merge fixes
Moved Menu to Client folder
Merge remote-tracking branch 'origin/GenDeathrow' into bigUpdate

Conflicts:
	src/main/java/enviromine/core/proxies/EM_ClientProxy.java
	src/main/java/enviromine/handlers/keybinds/EnviroKeybinds.java
Merge branch 'Fuwnayguy' into bigUpdate
Post-merge fixes