first test
added alpha version of entity watcher
implemented entity watcher
Merge branch 'master' into mouse_integration
Merge branch 'master' into mouse_integration

Conflicts:
	lib/Entities.py
	lib/Tile.py
added missing merge conflict resolution
Merge branch 'master' into mouse_integration
renamed keylistener to inputlistener
fixed import error