98-merge-conflicts-renaming

solved merge errors in Spineable
renamed the Component to BaseObject and renamed all references and variables