merge mojosyncframework stuff back into master