In game custom avatars (broken feature restored)
Merge branch 'in-game-avatars' into beta
Emergency fix/deploy for localStorage option bug

Previous release made the existing localStorage variable 'sortkey'
invalid.
Merge branch 'master' into beta (sortkey bug fix)

Conflicts:
	config.rb