New activity: InformationPlantActivity
Correct bug
Bug Correction
Merge branch 'master' of https://github.com/xxahtixx/aad2Project

Conflicts:
	AndroidManifest.xml
	bin/R.txt
	bin/classes/android/support/v7/appcompat/R$layout.class
	bin/classes/com/example/aad2project/R$id.class
	bin/classes/com/example/aad2project/R$integer.class
	bin/classes/com/example/aad2project/R$layout.class
	bin/classes/com/example/aad2project/R$menu.class
	bin/classes/com/example/aad2project/R$string.class
	bin/classes/com/example/aad2project/R$style.class
	bin/classes/com/example/aad2project/R$styleable.class
	bin/classes/com/example/aad2project/ui/AccountCreationFragment.class
	bin/classes/com/example/aad2project/ui/ManagerActivity$PlaceholderFragment.class
	bin/classes/com/example/aad2project/ui/ManagerActivity$SectionsPagerAdapter.class
	bin/classes/com/example/aad2project/ui/ManagerActivity.class
	bin/classes/com/example/aad2project/ui/PlantManagerFragment$1.class
	bin/classes/com/example/aad2project/ui/PlantManagerFragment$2.class
	bin/classes/com/example/aad2project/ui/PlantManagerFragment.class
	bin/classes/com/example/aad2project/ui/TaskCalendarFragment.class
	bin/jarlist.cache
	gen/android/support/v7/appcompat/R.java
	gen/com/example/aad2project/R.java
	project.properties