Link to android-developers for HTTP Clients
Merge remote-tracking branch 'origin/master'

Conflicts:
	report/report.tex