Merge branch 'feature/ticket11_import_export_mockups_json' into develop
Merge branch 'feature/fix_object_has_no_method_toggle_navigation' into develop
Merge remote-tracking branch 'upstream/master' into develop
groupbox/Fieldset widget
Merge pull request #15 from AndreMiras/feature/groupbox_fieldset_widget

Feature/groupbox fieldset widget