Things and stuff
Merge remote-tracking branch 'origin/master'
commit
Merge branch 'lwjgl-base'

Conflicts:
	client/src/tk/zeryter/asmp/window/Render.java
Named everything
cleanup