Merge remote-tracking branch 'origin/develop' into ui
Add FormatterKit framework
Improve UI
Merge remote-tracking branch 'origin/ui' into develop