documentation cleanup
rewrite
Add more template examples
Merge remote-tracking branch 'origin/master'