f
Merge branch 'master' of https://github.com/sylvain121/freeciv-web

Conflicts:
	.idea/workspace.xml
	app.js
x