some changes… try to collide things
Merge branch 'model' of https://github.com/gormed/ubicomp_h5n1 into model

Conflicts:
	blinddog/build/classes/com/blinddog/entities/Grass.class
	blinddog/build/classes/com/blinddog/entities/Person.class