Merge branch 'wip'
small update
not working example, caused by a bug in em
example update
fix
update
update, many to many is not fully working, but persisting works
example not working - wip, maybe tomorrow
fix in em, samples updated