Update files to fit with CUA theme
Update code
Update code to be like Styleguide
Update code
Make more changes to reflect the Styleguide
Harmonize framework code with cuastyleguide
Merge branch 'feature/refactor' into develop