.
Merge branch 'master' of github.com:GeoGames/troda-frontend

Conflicts:
	js/troda.js