Guides Merge RC2 

Finally ;)
Must be some stuff forgotten but first good step towards ending it
Nickpick! Could you rename this field (just the SQL) `virtual_unit` please? (SQL uses underscore, Scala not.)