developer guides, templates review
Merge branch 'docsrewrite' of git://github.com/wilr/sapphire into docsrewrite