modify androidManifest

modify
Merge branch 'master' of https://github.com/TEDinTW/drink

Conflicts:
	src/com/example/drinkorder/utils/WebServiceGateway.java