Merge remote-tracking branch 'origin/ui' into develop
Add missing workspace
Fix bug in category view controller and reuse code in the view controllers
Merge remote-tracking branch 'origin/develop' into ui