summary view on page
merge conflicts resolved
Merge branch 'summary'
fixed merge conflicts dos