Add topic/subtopic layout to the main page.
Modify the CSS layout, add new content to the page.
Merge branch 'master' into development

Conflicts:
	index.html