tablet layout
Merge branch 'alex'

Conflicts:
	AndroidManifest.xml
	src/com/example/aad2project/ui/ManagerActivity.java
	src/com/example/aad2project/ui/PlantManagerFragment.java