resource changes
Merge branch 'master' of https://github.com/autekroy/Import-Export-Animats

Conflicts:
	animats.pyc
	simulation.py