Moved the storing of objects to MainModel and updated DiagramModel and LibraryModel to use that instead. Also deprecated DiagramObjectModel as per decision. Updated validation of parent classes so that no more NullPointerExceptions are raised (for now)