prepare doc
doc templates ++
Merge branch 'master' into gh-pages