Fixed issue with PlantInformationFragment / Plant Deletion
Merge branch 'gerard'

Conflicts:
	src/com/example/aad2project/model/PlantDao.java
One file left in the last commit.
Merge branch 'master' of https://github.com/xxahtixx/aad2Project
Weather
Merge branch 'Toscan'
Notifications fixed (should work but didn't tried yet)
Merge branch 'Alexandre'
Update TaskPlantDao.java

update getCurrentDayTask function
Returned to int in weather.java
Merge branch 'asier'
Changed package structure
Fixed Issue where the ListView was not refreshing after using the filter
Fix errors: filter and database Plant