Fix manifest errors
tablet layout
Merge branch 'alex'

Conflicts:
	AndroidManifest.xml
	src/com/example/aad2project/ui/ManagerActivity.java
	src/com/example/aad2project/ui/PlantManagerFragment.java
Fixed ShowInfo option of Dialog
Added TaskInformationFragment to the phone and tablet layouts
Notification every day at 18:00
Comments added
Update DatabaseHandler.java

add INSErt into weather table
Return button error fixed
Update DatabaseHandler.java

add plant in database
Green theme, new Task row layout
Merge branch 'gerard'

Conflicts:
	src/com/example/aad2project/model/DatabaseHandler.java
TODO and icon