FooterTest
Merge branch 'master' of https://github.com/justphil/inform-cg

Conflicts:
	app/scripts/services/dialogFragmentLoader.js
	app/scripts/services/dialogMarkupBuilder.js