Merge branch 'master' into integ

Conflicts:
	sgdfrontend/templates/header.jinja2

Refactored literature page.

Refactored analyze page.