Rename UIContext to LocalContext
Separate @Bean declarations into modular classes
Merge branch 'develop'