Refresh WORKING
Merge branch 'Manu'

Conflicts:
	src/com/example/aad2project/model/PlantDao.java
	src/com/example/aad2project/ui/ManagerActivity.java
	src/com/example/aad2project/ui/TaskCalendarFragment.java