Some corrections
Merge branch 'manu'

Conflicts:
	src/com/example/aad2project/model/DatabaseHandler.java
Fragments communication with Activity (no Refresh)
Merge branch 'gerard'

Conflicts:
	src/com/example/aad2project/model/TaskPlantDao.java
	src/com/example/aad2project/ui/TaskCalendarAdapter.java
	src/com/example/aad2project/ui/TaskCalendarFragment.java
Fix errors
Merge branch 'asier'

Conflicts:
	src/com/example/aad2project/ui/TaskCalendarFragment.java
Request Weather
Manifest
Merge branch 'Toscan'

Conflicts:
	AndroidManifest.xml
	src/com/example/aad2project/ui/ManagerActivity.java
conflit
Merge branch 'master' of https://github.com/xxahtixx/aad2Project
correct an error in size() functions
Timestamp conversion
PlantInformationFragment now loads the correct clant
Merge branch 'gerard'
Merge branch 'manu'

Conflicts:
	src/com/example/aad2project/ui/PlantManagerFragment.java
	src/com/example/aad2project/ui/TaskCalendarFragment.java
Fix some errors
Merge branch 'master' of https://github.com/xxahtixx/aad2Project

Conflicts:
	src/com/example/aad2project/model/PlantDao.java
Get weather
Weather