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

Conflicts:
	res/layout/createeventactivityview.xml
	src/com/openmap/grupp1/CreateEventActivity.java
	src/com/openmap/grupp1/MainActivity.java