task calendar
Merge branch 'manu'

Conflicts:
	src/com/example/aad2project/model/TaskPlant.java
	src/com/example/aad2project/model/TaskPlantDao.java
	src/com/example/aad2project/ui/PlantManagerFragment.java
	src/com/example/aad2project/ui/TaskCalendarAdapter.java
	src/com/example/aad2project/ui/TaskCalendarFragment.java