Changed character properties to enums
Merge branch 'develop' into enums
Moved Subviews to UI Package
Merge branch 'enums' into develop