Merge branch of cryptomilk into ics