added detail page
Merge branch 'master' into detail_page