Timestamp conversion
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