updates

Conflicts:
	out/production/thesis-defense/Main.swf
	src/Worlds/IndividualHistoryWorld.as
stuff
stuff