parameters imported with actual name
trajectories can have params
little comment
Merge branch 'Agralove-master' into floatbonus

Conflicts:
	entity.py
New collide functions
Merge branch 'webplate-master' into floatbonus