update observation activity
Merge branch 'master' of https://github.com/cobweb-eu/Cobweb-flooding-App

Conflicts:
	COBWEBFLOODREPORTAPP/src/cobweb/addons/NoteDialog.java