User info passthrough
Merge remote-tracking branch 'origin/master'

Conflicts:
	SteampunkyFX/src/steampunkyfx/SteampunkFXController.java
	SteampunkyFX/src/steampunkyfx/SteampunkFXControllerlobby.java