stuff i already pushed on my laptop
Merge branch 'master' of https://bitbucket.org/daemonfire300/pleyus-alpha

Conflicts:
	app/models/user.go
Merge branch 'master' of github.com:daemonfire300/pleyus-gh
still transitioning to the new lobbyuser system