minor changes
Merge branch 'master' of https://github.com/Toerq/OSM-Project

Conflicts:
	geese/src/geese_player.erl