ADD/DELETE finished and working
Manifest
Merge branch 'Manu'

Conflicts:
	src/com/example/aad2project/ui/PlantManagerFragment.java