Merge with upstream/master
Merge with merge guides
Updated guides
Merge pull request #275 from PonteIneptique/new_guides

New org. layout and other changes.