Add html structure to content.jsp into articlepage
Merge remote-tracking branch 'origin/master'