switching site
Changing summary title and submission title
Merge branch 'master' into production

Conflicts:
	js/main.js