Commit
Merge branch 'master' of https://github.com/AdamTorkelsson/openmap

Conflicts:
	gen/com/openmap/grupp1/R.java