WoW character roster consolidation
Updated bundle
Merge branch 'master' into foundation

Conflicts:
	Gemfile.lock