Request Weather
Manifest
Merge branch 'Toscan'

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