Merge branch 'master' into meme_provider_fix
added autosaving state object
Merge branch 'serialization'
Resolved compilation issues