Added parameters
Merge branch 'master' of https://github.com/aquintiliano/tatu

Conflicts:
	ZooScapeMapEditor/src/zooscapemapeditor/beans/AnimatedObject.java