#93: Re-add brain.xml and images.
#97: Final map design.
Merge branch 'master' into 97

Conflicts:
	app/_scss/main.scss
	app/js/cdl.js