Fixed issue where fragments would not refresh after screen rotation.
Deleted all Logs
Merge branch 'Manu'

Conflicts:
	src/com/example/aad2project/model/PlantDao.java
	src/com/example/aad2project/model/TaskPlantDao.java
Weather
Merge branch 'master' of https://github.com/xxahtixx/aad2Project into Master2

Conflicts:
	src/com/example/aad2project/services/WeatherService.java
Fix show view
Merge branch 'master' of https://github.com/xxahtixx/aad2Project
Fixed import of WeatherService
Update DatabaseHandler.java

Plant table last version
Want to pull so I push
Merge branch 'asier'

Conflicts:
	res/values/strings.xml
Button on the plantinfofragment
Notifications working
Manifest changes
Merge branch 'gerard'
Server part for the login (and account creation) Ask kevin for the ip adress and change it in the SendToServer class
Merge branch 'master' into Alexandre
Cloud connection