Implementing feature #4, replaced HTML tags by HTML5 tags
Merge branch 'feature-4' into develop