Guides Merge RC2 

Finally ;)
Must be some stuff forgotten but first good step towards ending it