Fixade markörer och app ikon
Merge branch 'master' into ibbe
Mergat ibbes branch med master
Conflicts:
	GameOfNature/gen/se/lth/gameofnature/R.java
	GameOfNature/res/drawable-hdpi/marker_birdhouse.png
	GameOfNature/res/drawable-hdpi/marker_tree.png
	GameOfNature/res/raw/map.txt