merger darkua branch into relayr

put mosca changes under relayr account