Dialog ruta fixad
Merge branch 'master' into ibbe
Mergar ibbes branch
Conflicts:
	GameOfNature/gen/se/lth/gameofnature/R.java
	GameOfNature/res/values/strings.xml