Locator
Locator
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroidManifest.xml
	project.properties
	res/layout/locator.xml
	src/be/phl/mosaqua/CoreMapActivity.java
	src/be/phl/mosaqua/Locator.java
Ophalen van openingsuren aangepast
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroidManifest.xml
	src/be/phl/mosaqua/tasks/AsyncInfoTask.java
Ophalen van openingsuren aangepast