Included jre-7 in the classpath
Merge branch 'master' of https://github.com/smartwatermanagement/self-healing-water-networks.git
Merge branch 'master' of https://github.com/smartwatermanagement/self-healing-water-networks.git
1. Skeletal files for WaterUsageAction. DAO to get the network structure. Changed AssetsDAO to reflect changed DB schema.
Files missed out in the last commit
Merge branch 'master' of
https://github.com/smartwatermanagement/self-healing-water-networks

Conflicts:
	SWNBackend/DB SQL FIle/swndb.sql