WIP redesign
WIP redesign
Merge branch 'settingsRedesign' into development

Conflicts:
	VikingClassResources.lua