update ui + logo; fps setting now correct; some fixes
Merge branch 'master' of https://github.com/b0rengar/VR

Conflicts:
	ress/b0rengar.properties
	src/main/ClientMain.java