Activity Detail HTML page
Merge branch 'origin/master'