Added more screenshots and diagrams
Merge branch 'masterdev'