Fixed namd to name;
Added trivia for futurama
Merge branch 'master' of github.com:TeamFauna/dumbo

Conflicts:
	tools/metadata/data/futurama_s1e9/manual.py