merged
Merge branch 'master' of
https://github.com/mogooAndroid/mogoo_public.git

Conflicts:
	library/src/com/michelin/droid/download/DownloadTask.java