Changes in database design
Merge branch 'master' of
https://github.com/smartwatermanagement/self-healing-water-networks

Conflicts:
	SWNBackend/DB SQL FIle/swndb.sql