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

Conflicts:
	ComplexAction/UserInterface/UpDownNumericField.swift