Commit
Merge origin/master
Made all content that had to be serialized implement the serializable interface