Fix PlantInformationFragment + Fix TaskCalendarList
Notifications works (normally, doesn't have time to test it completely)
Merge branch 'master' into Alexandre
Display Weather in the information plant
Merge branch 'Manu'
Communication between LoginActivity and fragments + Minor changes
Merge branch 'gerard'
Some fixes
Merge branch 'Manu'

Conflicts:
	src/com/example/aad2project/model/DaoBase.java
Fixed issue with PlantInformationFragment / Plant Deletion
Merge branch 'gerard'

Conflicts:
	src/com/example/aad2project/model/PlantDao.java
One file left in the last commit.
Pulling the project
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
Merge branch 'asier'