Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/sylvesterkole/Cobweb-flooding-App

Conflicts:
	COBWEBFLOODREPORTAPP/res/values-cy/strings.xml
	COBWEBFLOODREPORTAPP/res/values/strings.xml

	COBWEBFLOODREPORTAPP/src/com/example/cobwebfloodreportapplication/PHOTOActivity.java
Merge branch 'master' of https://github.com/sylvesterkole/Cobweb-flooding-App

Conflicts:

	COBWEBFLOODREPORTAPP/src/com/example/cobwebfloodreportapplication/PHOTOActivity.java
Merge branch 'master' of https://github.com/cobweb-eu/Cobweb-flooding-App
Merge branch 'master' of https://github.com/cobweb-eu/Cobweb-flooding-App
Merge branch 'master' of https://github.com/cobweb-eu/Cobweb-flooding-App

Conflicts:
	COBWEBFLOODREPORTAPP/src/cobweb/addons/NoteDialog.java
Merge branch 'master' of https://github.com/cobweb-eu/Cobweb-flooding-App
Merge branch 'master' of
https://github.com/cobweb-eu/Cobweb-flooding-App

Conflicts:
	COBWEBFLOODREPORTAPP/src/com/example/cobwebfloodreportapplication/PHOTOActivity.java
Merge branch 'master' of
https://github.com/cobweb-eu/Cobweb-flooding-App
Merge branch 'master' of https://github.com/cobweb-eu/Cobweb-flooding-App.git
Merge branch 'master' of https://github.com/cobweb-eu/Cobweb-flooding-App
Merge branch 'master' of https://github.com/cobweb-eu/Cobweb-flooding-App

Conflicts:

	COBWEBFLOODREPORTAPP/src/com/example/cobwebfloodreportapplication/Observation.java

	COBWEBFLOODREPORTAPP/src/com/example/cobwebfloodreportapplication/ObservationActivity.java
Merge remote-tracking branch 'origin/master'

Conflicts:

	COBWEBFLOODREPORTAPP/src/com/example/cobwebfloodreportapplication/GeoJSONHelper.java