stuff
Pretty sure this is merged now
Marshalling from Jolie to DBus now fully works. Dbus to Jolie is next
merge
merge theirs