Location handler
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/it/polito/dma/ponyexpressandroid/library/GcmIntentService.java