beta 6 fix
Merge branch 'feature/Initiative' into develop

Conflicts:
	ComplexAction/UserInterface/UpDownNumericField.swift
calculator appearances
moved some stuff out of the UIView extension into appearance manager. Refactored Dice views to use it.
Merge branch 'feature/appearance_refactor' into develop
tweaked home controller to use appearance manager.